diff options
| author |   talio <tali.orenbach@amdocs.com> | 2017-11-05 11:34:51 +0200 |
|---|---|---|
| committer | talio <tali.orenbach@amdocs.com> | 2017-11-06 10:17:35 +0200 |
| commit | 777a3493a4dc4bfeb854b3b820dc5968124af87e (patch) | |
| tree | 29836c3cb2ab846b0b3241727f4b92782afdac1e /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute | |
| parent | 7b492b5f191cd5c22e3c4254f5f3ef7476122e9d (diff) | |
duplicate ids
throw an exception when a zip with duplicate ids in different files is getting uploaded
Issue - Id : SDC-554
Change-Id: I213233d8833b89788f980db859d9597d2c1cb950
Signed-off-by: talio <tali.orenbach@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute')
41 files changed, 6450 insertions, 6450 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/in/nested-pcm_v0.1.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/in/nested-pcm_v0.1.yaml index 01f875739a..ee1e27d5de 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/in/nested-pcm_v0.1.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/in/nested-pcm_v0.1.yaml @@ -57,7 +57,7 @@ parameters: description: the name of security group resources: - server_pcm: + server_pcm_1: type: OS::Nova::Server properties: config_drive: "True" @@ -91,4 +91,4 @@ resources: 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/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/in/nested-pcm_v0.2.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/in/nested-pcm_v0.2.yaml index 01f875739a..0c18b9ce04 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/in/nested-pcm_v0.2.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/in/nested-pcm_v0.2.yaml @@ -66,14 +66,14 @@ 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_02} + - port: { get_resource: pcm_port_12} block_device_mapping: - device_name: vdb volume_id: { get_param: pcm_vol} user_data_format: RAW - pcm_port_0: + pcm_port_02: type: OS::Neutron::Port properties: network: { get_param: cps_net_name } @@ -81,7 +81,7 @@ resources: - ip_address: { get_param: cps_net_ip } security_groups: [{ get_param: security_group_name }] - pcm_port_1: + pcm_port_12: type: OS::Neutron::Port properties: network: { get_param: oam_net_name } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 92ea0fa5e7..9ff008ea80 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,43 +8,49 @@ node_types: org.openecomp.resource.abstract.nodes.heat.pcm_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pcm_port_0_network_role: - type: string - required: true - status: SUPPORTED - port_pcm_port_1_network_role_tag: - type: string + port_pcm_port_02_order: + type: integer required: true status: SUPPORTED - availabilityzone_name: - type: string - description: availabilityzone name + port_pcm_port_12_vlan_requirements: + type: list required: true status: SUPPORTED - port_pcm_port_0_vlan_requirements: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pcm_port_02_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - pcm_image_name: + availabilityzone_name: type: string - description: PCRF CM image name + description: availabilityzone name required: true status: SUPPORTED - port_pcm_port_0_order: + port_pcm_port_12_order: type: integer required: true status: SUPPORTED - port_pcm_port_0_subnetpoolid: + port_pcm_port_02_network_role: type: string required: true status: SUPPORTED - port_pcm_port_1_subnetpoolid: + pcm_image_name: type: string + description: PCRF CM image name required: true status: SUPPORTED - port_pcm_port_0_network_role_tag: + port_pcm_port_02_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pcm_port_12_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pcm_port_02_subnetpoolid: type: string required: true status: SUPPORTED @@ -58,29 +64,19 @@ node_types: description: CPS network mask required: true status: SUPPORTED - port_pcm_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pcm_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED oam_net_name: type: string description: OAM network name required: true status: SUPPORTED - port_pcm_port_1_network_role: + port_pcm_port_12_network_role: type: string required: true status: SUPPORTED - port_pcm_port_0_ip_requirements: - type: list + port_pcm_port_02_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements oam_net_gw: type: string description: CPS network gateway @@ -96,34 +92,28 @@ node_types: description: CPS network ip required: true status: SUPPORTED - port_pcm_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pcm_port_1_vlan_requirements: + port_pcm_port_12_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements pcm_flavor_name: type: string description: flavor name of PCRF CM instance required: true status: SUPPORTED - pcm_vol: + port_pcm_port_12_subnetpoolid: type: string - description: CPS Cluman Cinder Volume required: true status: SUPPORTED - port_pcm_port_1_ip_requirements: - type: list + pcm_vol: + type: string + description: CPS Cluman Cinder Volume required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pcm_port_02_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED cps_net_name: @@ -141,29 +131,26 @@ node_types: description: CPS network mask required: true status: SUPPORTED - port_pcm_port_1_order: - type: integer + port_pcm_port_12_network_role_tag: + type: string required: true status: SUPPORTED + port_pcm_port_12_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pcm_port_02_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements attributes: server_pcm_id: type: string description: the pcm nova service id status: SUPPORTED requirements: - - dependency_pcm_port_1: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_pcm_port_1: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_server_pcm: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -178,57 +165,63 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pcm_port_0: + - dependency_pcm_port_12: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_port_0: + - link_pcm_port_12: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - 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. + - dependency_pcm_port_02: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: - - 1 + - 0 - UNBOUNDED + - link_pcm_port_02: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 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: + 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_1: + disk.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 - memory_server_pcm: + network.incoming.packets_pcm_port_02: type: org.openecomp.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: - 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_02: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pcm_port_0: + network.outgoing.bytes_pcm_port_12: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -252,6 +245,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pcm_port_02: + type: org.openecomp.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. @@ -264,6 +263,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_pcm_port_12: + type: org.openecomp.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. @@ -276,12 +281,22 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pcm_port_02: + 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. occurrences: - 1 - UNBOUNDED + feature_pcm_port_12: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED 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. @@ -294,33 +309,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pcm_port_0: + network.outgoing.packets.rate_pcm_port_02: type: org.openecomp.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.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 - 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: + network.outgoing.bytes_pcm_port_02: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -349,74 +350,66 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pcm_port_0: + 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.outgoing.packets.rate_pcm_port_1: + network.outgoing.bytes.rate_pcm_port_12: type: org.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: + network.incoming.packets.rate_pcm_port_12: type: org.openecomp.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: - 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_12: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - feature_pcm_port_0: - type: tosca.capabilities.Node + endpoint_server_pcm: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pcm_port_1: + network.incoming.bytes.rate_pcm_port_02: type: org.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 + 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 - attachment_pcm_port_1: + attachment_pcm_port_12: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - endpoint_server_pcm: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED - disk.device.read.requests.rate_server_pcm: + 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. occurrences: - 1 - UNBOUNDED - vcpus_server_pcm: + 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. occurrences: - 1 - UNBOUNDED - disk.write.bytes_server_pcm: + network.outgoing.packets.rate_pcm_port_12: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -457,61 +450,68 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_server_pcm: + network.outgoing.bytes.rate_pcm_port_02: type: org.openecomp.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.outpoing.packets_pcm_port_12: type: org.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 - occurrences: - - 1 - - UNBOUNDED - cpu.delta_server_pcm: + network.incoming.packets.rate_pcm_port_02: type: org.openecomp.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: + 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.incoming.packets_pcm_port_0: + binding_pcm_port_02: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.device.write.bytes.rate_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: + 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 - disk.device.capacity_server_pcm: + network.incoming.packets_pcm_port_12: type: org.openecomp.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: @@ -541,24 +541,24 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_server_pcm: - type: tosca.capabilities.Node + network.incoming.bytes_pcm_port_12: + type: org.openecomp.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: - 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: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_server_pcm: + network.outpoing.packets_pcm_port_02: type: org.openecomp.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.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: @@ -723,14 +723,14 @@ node_types: occurrences: - 1 - 1 - - dependency_server_pcm: + - dependency_server_pcm_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_server_pcm: + - local_storage_server_pcm_1: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage relationship: tosca.relationships.AttachesTo @@ -751,13 +751,13 @@ node_types: - 1 - 1 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: + 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. occurrences: @@ -775,85 +775,67 @@ 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 - disk.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 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.iops_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 - memory.resident_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.write.requests_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.device.usage_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.allocation_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.usage_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.device.write.bytes_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 - disk.root.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 - disk.ephemeral.size_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.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.incoming.bytes_pcm_port_0: + 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: @@ -879,42 +861,30 @@ 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 - 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. + feature_server_pcm_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.capacity_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 - os_server_pcm: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - disk.read.bytes_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 - network.outgoing.packets.rate_pcm_port_0: + 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_1: + 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: @@ -925,13 +895,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pcm_port_0: + 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 - 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: @@ -942,6 +912,12 @@ node_types: occurrences: - 1 - UNBOUNDED + 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 network.outgoing.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. @@ -958,84 +934,96 @@ node_types: occurrences: - 1 - UNBOUNDED - endpoint_server_pcm: + 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_1: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_server_pcm: + 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 - vcpus_server_pcm: + 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.write.bytes_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 - disk.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. + host_server_pcm_1: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_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.device.allocation_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 - scalable_server_pcm: - type: tosca.capabilities.Scalable + 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.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 - cpu_util_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.write.requests.rate_server_pcm: + 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 - disk.device.write.bytes.rate_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 - host_server_pcm: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + 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 - cpu.delta_server_pcm: + 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: @@ -1053,8 +1041,9 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_server_pcm: - type: tosca.capabilities.network.Bindable + 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 @@ -1064,7 +1053,7 @@ node_types: 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: @@ -1076,32 +1065,32 @@ node_types: occurrences: - 1 - UNBOUNDED - instance_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.device.write.requests.rate_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.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 - feature_server_pcm: - type: tosca.capabilities.Node + os_server_pcm_1: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED @@ -1111,7 +1100,18 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_server_pcm: + binding_server_pcm_1: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + 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 + 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: @@ -1417,4 +1417,4 @@ node_types: type: tosca.capabilities.network.Bindable occurrences: - 1 - - UNBOUNDED + - UNBOUNDED
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml index c44e813cab..d2af2b96c2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml @@ -63,34 +63,34 @@ topology_template: get_input: pcm_flavor_name service_template_filter: substitute_service_template: nested-pcm_v0.2ServiceTemplate.yaml - port_pcm_port_1_network_role_tag: oam + port_pcm_port_12_mac_requirements: + mac_count_required: + is_required: false availabilityzone_name: get_input: availabilityzone_name - port_pcm_port_0_ip_requirements: + port_pcm_port_02_mac_requirements: + mac_count_required: + is_required: false + pcm_image_name: + get_input: pcm_image_name + port_pcm_port_02_network_role_tag: cps + pcm_server_name: + get_input: + - pcm_server_names + - 0 + port_pcm_port_12_network_role_tag: oam + port_pcm_port_12_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - pcm_image_name: - get_input: pcm_image_name - port_pcm_port_1_mac_requirements: - mac_count_required: - is_required: false - port_pcm_port_1_ip_requirements: + port_pcm_port_02_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pcm_port_0_network_role_tag: cps - port_pcm_port_0_mac_requirements: - mac_count_required: - is_required: false - pcm_server_name: - get_input: - - pcm_server_names - - 0 server_pcm_001: type: org.openecomp.resource.abstract.nodes.heat.pcm_server_1 directives: @@ -193,4 +193,4 @@ topology_template: - server_pcm_002 - server_pcm_001 - compute_port_0 - - abstract_compute + - abstract_compute
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml index 8f2e3460e3..e0431278ab 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -175,9 +175,9 @@ topology_template: requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_pcm + node: server_pcm_1 relationship: tosca.relationships.network.BindsTo - server_pcm: + server_pcm_1: type: org.openecomp.resource.vfc.compute.nodes.heat.pcm_server properties: flavor: @@ -219,7 +219,7 @@ topology_template: requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_pcm + node: server_pcm_1 relationship: tosca.relationships.network.BindsTo groups: nested-pcm_v0.1_group: @@ -229,69 +229,60 @@ topology_template: description: heat template that creates PCRF Cluman stack members: - pcm_port_1 - - server_pcm + - server_pcm_1 - pcm_port_0 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.pcm_server_1 capabilities: + disk.root.size_server_pcm_1: + - server_pcm_1 + - disk.root.size 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 - disk.ephemeral.size_server_pcm: - - server_pcm - - disk.ephemeral.size - disk.device.latency_server_pcm: - - server_pcm - - disk.device.latency + 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 + disk.capacity_server_pcm_1: + - server_pcm_1 + - disk.capacity + 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.incoming.bytes_pcm_port_0: - pcm_port_0 - network.incoming.bytes + 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.incoming.bytes_pcm_port_1: - pcm_port_1 - network.incoming.bytes @@ -301,39 +292,36 @@ topology_template: 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 + 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 + disk.allocation_server_pcm_1: + - server_pcm_1 + - disk.allocation + disk.device.write.bytes_server_pcm_1: + - server_pcm_1 + - disk.device.write.bytes feature_pcm_port_1: - pcm_port_1 - feature + memory.usage_server_pcm_1: + - server_pcm_1 + - memory.usage 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 + cpu_server_pcm_1: + - server_pcm_1 + - cpu network.outgoing.bytes_pcm_port_1: - pcm_port_1 - network.outgoing.bytes @@ -343,87 +331,99 @@ topology_template: attachment_pcm_port_1: - pcm_port_1 - attachment - endpoint_server_pcm: - - server_pcm + disk.device.read.bytes_server_pcm_1: + - server_pcm_1 + - disk.device.read.bytes + 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 + disk.device.iops_server_pcm_1: + - server_pcm_1 + - disk.device.iops + cpu.delta_server_pcm_1: + - server_pcm_1 + - cpu.delta + host_server_pcm_1: + - server_pcm_1 + - host + disk.device.capacity_server_pcm_1: + - server_pcm_1 + - disk.device.capacity + 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.ephemeral.size_server_pcm_1: + - server_pcm_1 + - disk.ephemeral.size + disk.latency_server_pcm_1: + - server_pcm_1 + - disk.latency + scalable_server_pcm_1: + - server_pcm_1 - 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_server_pcm_1: + - server_pcm_1 - 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 + memory_server_pcm_1: + - server_pcm_1 + - memory + 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 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 + 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 - disk.device.capacity_server_pcm: - - server_pcm - - disk.device.capacity + 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 - instance_server_pcm: - - server_pcm - - 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.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 + 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.incoming.bytes.rate_pcm_port_0: - pcm_port_0 - network.incoming.bytes.rate - disk.write.bytes.rate_server_pcm: - - server_pcm + binding_server_pcm_1: + - server_pcm_1 + - binding + disk.write.bytes.rate_server_pcm_1: + - server_pcm_1 - disk.write.bytes.rate + disk.device.allocation_server_pcm_1: + - server_pcm_1 + - disk.device.allocation network.incoming.bytes.rate_pcm_port_1: - pcm_port_1 - network.incoming.bytes.rate @@ -434,15 +434,15 @@ topology_template: link_pcm_port_1: - pcm_port_1 - link - local_storage_server_pcm: - - server_pcm - - local_storage + dependency_server_pcm_1: + - server_pcm_1 + - dependency dependency_pcm_port_0: - pcm_port_0 - dependency - dependency_server_pcm: - - server_pcm - - dependency dependency_pcm_port_1: - pcm_port_1 - dependency + 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/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml index 0fbb5e3cd9..f6d3eae817 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml @@ -11,39 +11,44 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pcm_port_0_network_role: - type: string + port_pcm_port_02_order: + type: integer required: true - port_pcm_port_1_network_role_tag: - type: string + port_pcm_port_12_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pcm_port_02_vlan_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements availabilityzone_name: label: availabilityzone name hidden: false immutable: false type: string description: availabilityzone name - port_pcm_port_0_vlan_requirements: - type: list + port_pcm_port_12_order: + type: integer + required: true + port_pcm_port_02_network_role: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements pcm_image_name: label: image name hidden: false immutable: false type: string description: PCRF CM image name - port_pcm_port_0_order: - type: integer - required: true - port_pcm_port_0_subnetpoolid: + port_pcm_port_02_network_role_tag: type: string required: true - port_pcm_port_1_subnetpoolid: - type: string + port_pcm_port_12_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pcm_port_0_network_role_tag: + port_pcm_port_02_subnetpoolid: type: string required: true pcm_server_name: @@ -58,26 +63,18 @@ topology_template: immutable: false type: string description: CPS network mask - port_pcm_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pcm_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true oam_net_name: label: OAM network name hidden: false immutable: false type: string description: OAM network name - port_pcm_port_1_network_role: + port_pcm_port_12_network_role: type: string required: true - port_pcm_port_0_ip_requirements: - type: list + port_pcm_port_02_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements oam_net_gw: label: CPS network gateway hidden: false @@ -96,33 +93,28 @@ topology_template: immutable: false type: string description: CPS network ip - port_pcm_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pcm_port_1_vlan_requirements: + port_pcm_port_12_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements pcm_flavor_name: label: PCRF CM flavor name hidden: false immutable: false type: string description: flavor name of PCRF CM instance + port_pcm_port_12_subnetpoolid: + type: string + required: true pcm_vol: label: CPS Cluman Cinder Volume hidden: false immutable: false type: string description: CPS Cluman Cinder Volume - port_pcm_port_1_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pcm_port_02_exCP_naming: + type: org.openecomp.datatypes.Naming required: true cps_net_name: label: CPS network name @@ -142,80 +134,88 @@ topology_template: immutable: false type: string description: CPS network mask - port_pcm_port_1_order: - type: integer + port_pcm_port_12_network_role_tag: + type: string + required: true + port_pcm_port_12_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pcm_port_02_ip_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements node_templates: - pcm_port_1: + server_pcm: + type: org.openecomp.resource.vfc.compute.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_12: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: - get_input: port_pcm_port_1_ip_requirements + get_input: port_pcm_port_12_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: port_pcm_port_1_network_role + get_input: port_pcm_port_12_network_role fixed_ips: - ip_address: get_input: oam_net_ip subnetpoolid: - get_input: port_pcm_port_1_subnetpoolid + get_input: port_pcm_port_12_subnetpoolid mac_requirements: - get_input: port_pcm_port_1_mac_requirements + get_input: port_pcm_port_12_mac_requirements exCP_naming: - get_input: port_pcm_port_1_exCP_naming + get_input: port_pcm_port_12_exCP_naming vlan_requirements: - get_input: port_pcm_port_1_vlan_requirements + get_input: port_pcm_port_12_vlan_requirements network_role_tag: - get_input: port_pcm_port_1_network_role_tag + get_input: port_pcm_port_12_network_role_tag network: get_input: oam_net_name order: - get_input: port_pcm_port_1_order + get_input: port_pcm_port_12_order requirements: - binding: capability: tosca.capabilities.network.Bindable node: server_pcm relationship: tosca.relationships.network.BindsTo - server_pcm: - type: org.openecomp.resource.vfc.compute.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_02: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: - get_input: port_pcm_port_0_ip_requirements + get_input: port_pcm_port_02_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: port_pcm_port_0_network_role + get_input: port_pcm_port_02_network_role fixed_ips: - ip_address: get_input: cps_net_ip subnetpoolid: - get_input: port_pcm_port_0_subnetpoolid + get_input: port_pcm_port_02_subnetpoolid mac_requirements: - get_input: port_pcm_port_0_mac_requirements + get_input: port_pcm_port_02_mac_requirements exCP_naming: - get_input: port_pcm_port_0_exCP_naming + get_input: port_pcm_port_02_exCP_naming vlan_requirements: - get_input: port_pcm_port_0_vlan_requirements + get_input: port_pcm_port_02_vlan_requirements network_role_tag: - get_input: port_pcm_port_0_network_role_tag + get_input: port_pcm_port_02_network_role_tag network: get_input: cps_net_name order: - get_input: port_pcm_port_0_order + get_input: port_pcm_port_02_order requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -228,9 +228,9 @@ topology_template: heat_file: ../Artifacts/nested-pcm_v0.2.yaml description: heat template that creates PCRF Cluman stack members: - - pcm_port_1 - server_pcm - - pcm_port_0 + - pcm_port_12 + - pcm_port_02 outputs: server_pcm_id: description: the pcm nova service id @@ -238,27 +238,24 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.pcm_server 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 + network.incoming.packets_pcm_port_02: + - pcm_port_02 + - network.incoming.packets + feature_pcm_port_02: + - pcm_port_02 + - feature + network.outgoing.bytes_pcm_port_12: + - pcm_port_12 + - network.outgoing.bytes disk.device.iops_server_pcm: - server_pcm - disk.device.iops @@ -268,42 +265,48 @@ topology_template: disk.device.write.requests_server_pcm: - server_pcm - disk.device.write.requests + network.incoming.bytes_pcm_port_02: + - pcm_port_02 + - network.incoming.bytes disk.device.usage_server_pcm: - server_pcm - disk.device.usage disk.allocation_server_pcm: - server_pcm - disk.allocation + network.incoming.bytes.rate_pcm_port_12: + - pcm_port_12 + - network.incoming.bytes.rate disk.usage_server_pcm: - server_pcm - disk.usage disk.device.write.bytes_server_pcm: - server_pcm - disk.device.write.bytes + attachment_pcm_port_02: + - pcm_port_02 + - attachment disk.root.size_server_pcm: - server_pcm - disk.root.size + feature_pcm_port_12: + - pcm_port_12 + - feature 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 - - 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_02: + - pcm_port_02 + - network.outgoing.packets.rate memory.usage_server_pcm: - server_pcm - memory.usage + network.outgoing.bytes_pcm_port_02: + - pcm_port_02 + - network.outgoing.bytes disk.read.requests_server_pcm: - server_pcm - disk.read.requests @@ -316,45 +319,39 @@ 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 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.outgoing.bytes.rate_pcm_port_12: + - pcm_port_12 + - network.outgoing.bytes.rate + network.incoming.packets.rate_pcm_port_12: + - pcm_port_12 + - network.incoming.packets.rate + binding_pcm_port_12: + - pcm_port_12 + - binding endpoint_server_pcm: - server_pcm - endpoint + network.incoming.bytes.rate_pcm_port_02: + - pcm_port_02 + - network.incoming.bytes.rate disk.device.read.requests.rate_server_pcm: - server_pcm - disk.device.read.requests.rate + attachment_pcm_port_12: + - pcm_port_12 + - attachment vcpus_server_pcm: - server_pcm - vcpus disk.write.bytes_server_pcm: - server_pcm - disk.write.bytes + network.outgoing.packets.rate_pcm_port_12: + - pcm_port_12 + - network.outgoing.packets.rate disk.iops_server_pcm: - server_pcm - disk.iops @@ -373,9 +370,21 @@ topology_template: cpu_util_server_pcm: - server_pcm - cpu_util + network.outgoing.bytes.rate_pcm_port_02: + - pcm_port_02 + - network.outgoing.bytes.rate + network.outpoing.packets_pcm_port_12: + - pcm_port_12 + - network.outpoing.packets + network.incoming.packets.rate_pcm_port_02: + - pcm_port_02 + - network.incoming.packets.rate disk.write.requests.rate_server_pcm: - server_pcm - disk.write.requests.rate + binding_pcm_port_02: + - pcm_port_02 + - binding disk.device.write.bytes.rate_server_pcm: - server_pcm - disk.device.write.bytes.rate @@ -385,24 +394,15 @@ topology_template: 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_pcm_port_12: + - pcm_port_12 - 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 @@ -415,34 +415,34 @@ topology_template: disk.device.read.requests_server_pcm: - server_pcm - disk.device.read.requests + network.incoming.bytes_pcm_port_12: + - pcm_port_12 + - network.incoming.bytes 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_02: + - pcm_port_02 + - 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 requirements: - link_pcm_port_0: - - pcm_port_0 - - link - link_pcm_port_1: - - pcm_port_1 - - link + dependency_pcm_port_02: + - pcm_port_02 + - dependency local_storage_server_pcm: - server_pcm - local_storage - dependency_pcm_port_0: - - pcm_port_0 + dependency_pcm_port_12: + - pcm_port_12 - dependency + link_pcm_port_12: + - pcm_port_12 + - link dependency_server_pcm: - server_pcm - dependency - dependency_pcm_port_1: - - pcm_port_1 - - dependency + link_pcm_port_02: + - pcm_port_02 + - link
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server.yaml index 7d8d5129d0..3f422dbb5e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server.yaml @@ -148,7 +148,7 @@ resources: type: OS::Heat::SwiftSignalHandle # vSON server OAM network port - vson_server_oam_net_port_0: + vson_server_oam_net_port_20: type: OS::Neutron::Port properties: name: @@ -165,9 +165,9 @@ resources: - {get_param: oam_net_security_group_id} # Create vSON server - vson_server: + vson_server_1: type: OS::Nova::Server - depends_on: [vson_server_oam_net_port_0] + depends_on: [vson_server_oam_net_port_20] properties: name: {get_param: [vson_vm_names, {get_param: instance_index}]} availability_zone: {get_param: [availability_zones, {get_param: instance_index}]} @@ -181,7 +181,7 @@ resources: vf_module_id: {get_param: vf_module_id} vm_role: {get_param: vfc_role} networks: - - port: {get_resource: vson_server_oam_net_port_0} + - port: {get_resource: vson_server_oam_net_port_20} scheduler_hints: group: {get_param: vson_server_group_id} user_data_format: RAW diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server_from_vol.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server_from_vol.yaml index 93f0fe7420..9447289bcc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server_from_vol.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server_from_vol.yaml @@ -134,7 +134,7 @@ resources: type: OS::Heat::SwiftSignalHandle # vSON server OAM network port - vson_server_oam_net_port_0: + vson_server_oam_net_port_10: type: OS::Neutron::Port properties: name: @@ -151,9 +151,9 @@ resources: - {get_param: oam_net_security_group_id} # Create vSON server - vson_server: + vson_server_3: type: OS::Nova::Server - depends_on: [vson_server_oam_net_port_0] + depends_on: [vson_server_oam_net_port_10] properties: name: {get_param: [vson_vm_names, {get_param: instance_index}]} block_device_mapping_v2: @@ -170,7 +170,7 @@ resources: vf_module_id: {get_param: vf_module_id} vm_role: {get_param: vfc_role} networks: - - port: {get_resource: vson_server_oam_net_port_0} + - port: {get_resource: vson_server_oam_net_port_10} scheduler_hints: group: {get_param: vson_server_group_id} user_data_format: RAW diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server_with_vol.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server_with_vol.yaml index 84cf6a783a..02660dc5ed 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server_with_vol.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server_with_vol.yaml @@ -145,7 +145,7 @@ resources: type: OS::Heat::SwiftSignalHandle # vSON server OAM network port - vson_server_oam_net_port_0: + vson_server_oam_net_port_00: type: OS::Neutron::Port properties: name: @@ -162,17 +162,17 @@ resources: - {get_param: oam_net_security_group_id} # Attach Cinder volume to the server - vson_server_volume_attach: + vson_server_volume_attach_1: type: OS::Cinder::VolumeAttachment - depends_on: vson_server + depends_on: vson_server_2 properties: - instance_uuid: {get_resource: vson_server} + instance_uuid: {get_resource: vson_server_2} volume_id: {get_param: [volume_ids, {get_param: instance_index}]} # Create vSON server - vson_server: + vson_server_2: type: OS::Nova::Server - depends_on: [vson_server_oam_net_port_0] + depends_on: [vson_server_oam_net_port_00] properties: name: {get_param: [vson_vm_names, {get_param: instance_index}]} availability_zone: {get_param: [availability_zones, {get_param: instance_index}]} @@ -186,7 +186,7 @@ resources: vf_module_id: {get_param: vf_module_id} vm_role: {get_param: vfc_role} networks: - - port: {get_resource: vson_server_oam_net_port_0} + - port: {get_resource: vson_server_oam_net_port_00} scheduler_hints: group: {get_param: vson_server_group_id} user_data_format: RAW diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 95604246af..d8c52bc864 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -18,12 +18,6 @@ node_types: description: Default gateway. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements instance_index: type: float description: Index of the instance. @@ -34,11 +28,21 @@ node_types: description: Unique name for this VF instance. required: true status: SUPPORTED + port_vson_server_oam_net_port_10_network_role: + type: string + required: true + status: SUPPORTED oam_net_subnet_prefix_length: type: string description: Prefix length of the subnet on the OAM network. required: true status: SUPPORTED + port_vson_server_oam_net_port_10_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vf_module_name: type: string description: Unique name for this VF module instance. @@ -62,20 +66,12 @@ node_types: description: Unique ID for this VF instance. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_network_role: - type: string - required: true - status: SUPPORTED vson_clm_oam_net_ip: type: string description: IP of the vSON Cluster Manager. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_vson_server_oam_net_port_0_subnetpoolid: + port_vson_server_oam_net_port_10_subnetpoolid: type: string required: true status: SUPPORTED @@ -113,16 +109,6 @@ node_types: description: The ID or name of the flavor to boot onto. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_network_role_tag: - type: string - required: true - status: SUPPORTED - port_vson_server_oam_net_port_0_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements availability_zones: type: list description: List of availability zones. @@ -137,6 +123,10 @@ node_types: status: SUPPORTED entry_schema: &id010 type: string + port_vson_server_oam_net_port_10_network_role_tag: + type: string + required: true + status: SUPPORTED ntp_servers: type: list description: List of NTP servers. @@ -144,19 +134,19 @@ node_types: status: SUPPORTED entry_schema: &id011 type: string + port_vson_server_oam_net_port_10_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED oam_net_id: type: string description: The ID of the OAM network. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_order: + port_vson_server_oam_net_port_10_order: type: integer required: true status: SUPPORTED - port_vson_server_oam_net_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED vson_vm_names: type: list description: A list of unique names to be issued to the vSON Cluster leaders. @@ -164,337 +154,347 @@ node_types: status: SUPPORTED entry_schema: &id012 type: string + port_vson_server_oam_net_port_10_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_vson_server_oam_net_port_10_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements requirements: - - dependency_vson_server: + - dependency_vson_server_3: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_vson_server: + - local_storage_vson_server_3: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage relationship: tosca.relationships.AttachesTo occurrences: - 0 - UNBOUNDED - - dependency_vson_server_oam_net_port_0: + - dependency_vson_server_oam_net_port_10: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vson_server_oam_net_port_0: + - link_vson_server_oam_net_port_10: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - disk.write.bytes_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + endpoint_vson_server_3: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.device.allocation_vson_server: + disk.read.bytes_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_vson_server_oam_net_port_0: + disk.read.requests_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.usage_vson_server: + network.incoming.packets.rate_vson_server_oam_net_port_10: type: org.openecomp.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_vson_server_oam_net_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. + binding_vson_server_3: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - disk.device.latency_vson_server: + disk.read.bytes.rate_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_vson_server: + disk.device.write.bytes_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests_vson_server: + instance_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory_vson_server: + disk.latency_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.latency_vson_server: + cpu_util_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - os_vson_server: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - feature_vson_server_oam_net_port_0: + feature_vson_server_oam_net_port_10: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - instance_vson_server: + disk.write.requests_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_vson_server: + memory_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_vson_server_oam_net_port_0: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - disk.iops_vson_server: + network.outgoing.bytes.rate_vson_server_oam_net_port_10: type: org.openecomp.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_vson_server_oam_net_port_0: + disk.device.read.requests.rate_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_vson_server: + disk.device.iops_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_vson_server: + disk.capacity_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - endpoint_vson_server: - type: tosca.capabilities.Endpoint.Admin + memory.usage_vson_server_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - vcpus_vson_server: + disk.usage_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_vson_server_oam_net_port_0: + disk.device.read.bytes.rate_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_vson_server: + network.outgoing.packets.rate_vson_server_oam_net_port_10: type: org.openecomp.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_vson_server: + disk.allocation_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.capacity_vson_server: + disk.write.requests.rate_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_vson_server: + disk.ephemeral.size_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.iops_vson_server: + network.incoming.bytes.rate_vson_server_oam_net_port_10: type: org.openecomp.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_vson_server: + disk.device.read.bytes_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_vson_server_oam_net_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. + binding_vson_server_oam_net_port_10: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + os_vson_server_3: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - disk.read.bytes_vson_server: + disk.root.size_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_vson_server: + disk.device.write.bytes.rate_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests_vson_server: + disk.device.write.requests_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_vson_server_oam_net_port_0: + network.incoming.packets_vson_server_oam_net_port_10: type: org.openecomp.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_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + host_vson_server_3: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_vson_server: + disk.device.latency_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.resident_vson_server: + cpu.delta_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_vson_server: + memory.resident_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - scalable_vson_server: - type: tosca.capabilities.Scalable + attachment_vson_server_oam_net_port_10: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_vson_server_oam_net_port_0: + network.incoming.bytes_vson_server_oam_net_port_10: type: org.openecomp.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_vson_server: + feature_vson_server_3: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.usage_vson_server: + disk.device.read.requests_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_util_vson_server: + network.outpoing.packets_vson_server_oam_net_port_10: type: org.openecomp.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_vson_server: + disk.device.usage_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu.delta_vson_server: + disk.device.write.requests.rate_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_vson_server: + vcpus_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_vson_server: - type: tosca.capabilities.Node + disk.write.bytes.rate_vson_server_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.allocation_vson_server: + disk.iops_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_vson_server: - type: tosca.capabilities.network.Bindable + scalable_vson_server_3: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - host_vson_server: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + disk.device.capacity_vson_server_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_vson_server_oam_net_port_0: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + disk.device.allocation_vson_server_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - network.incoming.bytes.rate_vson_server_oam_net_port_0: + cpu_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.requests_vson_server: + network.outgoing.bytes_vson_server_oam_net_port_10: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1036,12 +1036,10 @@ node_types: description: Default gateway. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_ip_requirements: - type: list + port_vson_server_oam_net_port_00_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements instance_index: type: float description: Index of the instance. @@ -1057,6 +1055,12 @@ node_types: description: Prefix length of the subnet on the OAM network. required: true status: SUPPORTED + port_vson_server_oam_net_port_00_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vf_module_name: type: string description: Unique name for this VF module instance. @@ -1085,23 +1089,11 @@ node_types: description: Unique ID for this VF instance. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_network_role: - type: string - required: true - status: SUPPORTED vson_clm_oam_net_ip: type: string description: IP of the vSON Cluster Manager. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_vson_server_oam_net_port_0_subnetpoolid: - type: string - required: true - status: SUPPORTED vson_dc_unit: type: string description: Name of the vSON Data Center. @@ -1125,6 +1117,10 @@ node_types: Swift account auth token. Example: 041a5187bb4641f9b89583e2539776b0 required: true status: SUPPORTED + port_vson_server_oam_net_port_00_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED vson_server_group_id: type: string description: | @@ -1136,16 +1132,6 @@ node_types: description: The ID or name of the flavor to boot onto. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_network_role_tag: - type: string - required: true - status: SUPPORTED - port_vson_server_oam_net_port_0_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements availability_zones: type: list description: List of availability zones. @@ -1173,17 +1159,27 @@ node_types: \ a new Datacenter/vSON member to existing vSON Cluster. \n" required: true status: SUPPORTED + port_vson_server_oam_net_port_00_order: + type: integer + required: true + status: SUPPORTED + port_vson_server_oam_net_port_00_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED oam_net_id: type: string description: The ID of the OAM network. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_order: - type: integer + port_vson_server_oam_net_port_00_vlan_requirements: + type: list required: true status: SUPPORTED - port_vson_server_oam_net_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_vson_server_oam_net_port_00_network_role: + type: string required: true status: SUPPORTED vson_vm_names: @@ -1193,337 +1189,341 @@ node_types: status: SUPPORTED entry_schema: &id006 type: string + port_vson_server_oam_net_port_00_subnetpoolid: + type: string + required: true + status: SUPPORTED requirements: - - dependency_vson_server: + - dependency_vson_server_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_vson_server: + - local_storage_vson_server_2: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage relationship: tosca.relationships.AttachesTo occurrences: - 0 - UNBOUNDED - - dependency_vson_server_oam_net_port_0: + - dependency_vson_server_oam_net_port_00: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vson_server_oam_net_port_0: + - link_vson_server_oam_net_port_00: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - disk.write.bytes_vson_server: + network.outpoing.packets_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.allocation_vson_server: + network.outgoing.bytes.rate_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_vson_server_oam_net_port_0: + instance_vson_server_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_vson_server: + disk.device.write.bytes_vson_server_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_vson_server_oam_net_port_0: + disk.read.requests_vson_server_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_vson_server: + disk.read.bytes_vson_server_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_vson_server: + network.outgoing.packets.rate_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests_vson_server: + disk.latency_vson_server_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_vson_server: + disk.read.bytes.rate_vson_server_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_vson_server: + endpoint_vson_server_2: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - os_vson_server: - type: tosca.capabilities.OperatingSystem + disk.write.requests_vson_server_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_vson_server_oam_net_port_0: - type: tosca.capabilities.Node + binding_vson_server_oam_net_port_00: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - instance_vson_server: + memory_vson_server_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_vson_server: + network.outgoing.bytes_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_vson_server_oam_net_port_0: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - disk.iops_vson_server: + cpu_util_vson_server_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_vson_server_oam_net_port_0: + disk.device.read.requests.rate_vson_server_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_vson_server: + disk.device.iops_vson_server_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_vson_server: + disk.allocation_vson_server_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 - endpoint_vson_server: - type: tosca.capabilities.Endpoint.Admin + memory.usage_vson_server_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_vson_server: + disk.usage_vson_server_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_vson_server_oam_net_port_0: + network.incoming.packets_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_vson_server: + disk.capacity_vson_server_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_vson_server: + disk.device.read.bytes.rate_vson_server_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_vson_server: + network.incoming.packets.rate_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_vson_server: + network.incoming.bytes_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.iops_vson_server: + disk.write.requests.rate_vson_server_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_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_vson_server_oam_net_port_00: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outpoing.packets_vson_server_oam_net_port_0: + disk.ephemeral.size_vson_server_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_vson_server: + disk.device.read.bytes_vson_server_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_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + os_vson_server_2: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - disk.device.write.requests_vson_server: + disk.root.size_vson_server_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_vson_server_oam_net_port_0: + disk.device.write.requests_vson_server_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_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + host_vson_server_2: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_vson_server: + disk.device.write.bytes.rate_vson_server_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_vson_server: + cpu.delta_vson_server_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_vson_server: + disk.device.latency_vson_server_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_vson_server: - type: tosca.capabilities.Scalable + feature_vson_server_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_vson_server_oam_net_port_0: + memory.resident_vson_server_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_vson_server: + disk.write.bytes_vson_server_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_vson_server: + disk.device.usage_vson_server_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_vson_server: + disk.device.write.requests.rate_vson_server_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_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_vson_server_2: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - cpu.delta_vson_server: + vcpus_vson_server_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_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_vson_server_2: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - feature_vson_server: - type: tosca.capabilities.Node + disk.write.bytes.rate_vson_server_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_vson_server: + disk.iops_vson_server_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_vson_server: - type: tosca.capabilities.network.Bindable + cpu_vson_server_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_vson_server: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + feature_vson_server_oam_net_port_00: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - binding_vson_server_oam_net_port_0: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + disk.device.allocation_vson_server_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: - - 0 + - 1 - UNBOUNDED - network.incoming.bytes.rate_vson_server_oam_net_port_0: + disk.device.read.requests_vson_server_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_vson_server: + disk.device.capacity_vson_server_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: @@ -1542,12 +1542,10 @@ node_types: description: Default gateway. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_ip_requirements: - type: list + port_vson_server_oam_net_port_00_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements instance_index: type: float description: Index of the instance. @@ -1563,6 +1561,12 @@ node_types: description: Prefix length of the subnet on the OAM network. required: true status: SUPPORTED + port_vson_server_oam_net_port_00_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vf_module_name: type: string description: Unique name for this VF module instance. @@ -1590,23 +1594,11 @@ node_types: description: Unique ID for this VF instance. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_network_role: - type: string - required: true - status: SUPPORTED vson_clm_oam_net_ip: type: string description: IP of the vSON Cluster Manager. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_vson_server_oam_net_port_0_subnetpoolid: - type: string - required: true - status: SUPPORTED vson_dc_unit: type: string description: Name of the vSON Data Center. @@ -1629,6 +1621,10 @@ node_types: Swift account auth token. Example: 041a5187bb4641f9b89583e2539776b0 required: true status: SUPPORTED + port_vson_server_oam_net_port_00_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED vson_server_group_id: type: string description: | @@ -1640,16 +1636,6 @@ node_types: description: The ID or name of the flavor to boot onto. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_network_role_tag: - type: string - required: true - status: SUPPORTED - port_vson_server_oam_net_port_0_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements availability_zones: type: list description: List of availability zones. @@ -1674,17 +1660,27 @@ node_types: \ a new Datacenter/vSON member to existing vSON Cluster. \n" required: true status: SUPPORTED + port_vson_server_oam_net_port_00_order: + type: integer + required: true + status: SUPPORTED + port_vson_server_oam_net_port_00_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED oam_net_id: type: string description: The ID of the OAM network. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_order: - type: integer + port_vson_server_oam_net_port_00_vlan_requirements: + type: list required: true status: SUPPORTED - port_vson_server_oam_net_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_vson_server_oam_net_port_00_network_role: + type: string required: true status: SUPPORTED vson_vm_names: @@ -1693,337 +1689,341 @@ node_types: required: true status: SUPPORTED entry_schema: *id006 + port_vson_server_oam_net_port_00_subnetpoolid: + type: string + required: true + status: SUPPORTED requirements: - - dependency_vson_server: + - dependency_vson_server_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_vson_server: + - local_storage_vson_server_2: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage relationship: tosca.relationships.AttachesTo occurrences: - 0 - UNBOUNDED - - dependency_vson_server_oam_net_port_0: + - dependency_vson_server_oam_net_port_00: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vson_server_oam_net_port_0: + - link_vson_server_oam_net_port_00: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - disk.write.bytes_vson_server: + network.outpoing.packets_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.allocation_vson_server: + network.outgoing.bytes.rate_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_vson_server_oam_net_port_0: + instance_vson_server_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_vson_server: + disk.device.write.bytes_vson_server_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_vson_server_oam_net_port_0: + disk.read.requests_vson_server_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_vson_server: + disk.read.bytes_vson_server_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_vson_server: + network.outgoing.packets.rate_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests_vson_server: + disk.latency_vson_server_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_vson_server: + disk.read.bytes.rate_vson_server_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_vson_server: + endpoint_vson_server_2: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - os_vson_server: - type: tosca.capabilities.OperatingSystem + disk.write.requests_vson_server_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_vson_server_oam_net_port_0: - type: tosca.capabilities.Node + binding_vson_server_oam_net_port_00: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - instance_vson_server: + memory_vson_server_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_vson_server: + network.outgoing.bytes_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_vson_server_oam_net_port_0: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - disk.iops_vson_server: + cpu_util_vson_server_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_vson_server_oam_net_port_0: + disk.device.read.requests.rate_vson_server_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_vson_server: + disk.device.iops_vson_server_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_vson_server: + disk.allocation_vson_server_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 - endpoint_vson_server: - type: tosca.capabilities.Endpoint.Admin + memory.usage_vson_server_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_vson_server: + disk.usage_vson_server_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_vson_server_oam_net_port_0: + network.incoming.packets_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_vson_server: + disk.capacity_vson_server_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_vson_server: + disk.device.read.bytes.rate_vson_server_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_vson_server: + network.incoming.packets.rate_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_vson_server: + network.incoming.bytes_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.iops_vson_server: + disk.write.requests.rate_vson_server_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_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_vson_server_oam_net_port_00: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outpoing.packets_vson_server_oam_net_port_0: + disk.ephemeral.size_vson_server_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_vson_server: + disk.device.read.bytes_vson_server_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_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + os_vson_server_2: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - disk.device.write.requests_vson_server: + disk.root.size_vson_server_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_vson_server_oam_net_port_0: + disk.device.write.requests_vson_server_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_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + host_vson_server_2: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_vson_server: + disk.device.write.bytes.rate_vson_server_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_vson_server: + cpu.delta_vson_server_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_vson_server: + disk.device.latency_vson_server_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_vson_server: - type: tosca.capabilities.Scalable + feature_vson_server_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_vson_server_oam_net_port_0: + memory.resident_vson_server_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_vson_server: + disk.write.bytes_vson_server_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_vson_server: + disk.device.usage_vson_server_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_vson_server: + disk.device.write.requests.rate_vson_server_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_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_vson_server_2: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - cpu.delta_vson_server: + vcpus_vson_server_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_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_vson_server_2: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - feature_vson_server: - type: tosca.capabilities.Node + disk.write.bytes.rate_vson_server_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_vson_server: + disk.iops_vson_server_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_vson_server: - type: tosca.capabilities.network.Bindable + cpu_vson_server_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_vson_server: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + feature_vson_server_oam_net_port_00: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - binding_vson_server_oam_net_port_0: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + disk.device.allocation_vson_server_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: - - 0 + - 1 - UNBOUNDED - network.incoming.bytes.rate_vson_server_oam_net_port_0: + disk.device.read.requests_vson_server_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_vson_server: + disk.device.capacity_vson_server_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: @@ -2042,12 +2042,6 @@ node_types: description: Default gateway. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements instance_index: type: float description: Index of the instance. @@ -2058,11 +2052,21 @@ node_types: description: Unique name for this VF instance. required: true status: SUPPORTED + port_vson_server_oam_net_port_10_network_role: + type: string + required: true + status: SUPPORTED oam_net_subnet_prefix_length: type: string description: Prefix length of the subnet on the OAM network. required: true status: SUPPORTED + port_vson_server_oam_net_port_10_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vf_module_name: type: string description: Unique name for this VF module instance. @@ -2085,20 +2089,12 @@ node_types: description: Unique ID for this VF instance. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_network_role: - type: string - required: true - status: SUPPORTED vson_clm_oam_net_ip: type: string description: IP of the vSON Cluster Manager. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_vson_server_oam_net_port_0_subnetpoolid: + port_vson_server_oam_net_port_10_subnetpoolid: type: string required: true status: SUPPORTED @@ -2135,16 +2131,6 @@ node_types: description: The ID or name of the flavor to boot onto. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_network_role_tag: - type: string - required: true - status: SUPPORTED - port_vson_server_oam_net_port_0_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements availability_zones: type: list description: List of availability zones. @@ -2157,362 +2143,376 @@ node_types: required: true status: SUPPORTED entry_schema: *id010 + port_vson_server_oam_net_port_10_network_role_tag: + type: string + required: true + status: SUPPORTED ntp_servers: type: list description: List of NTP servers. required: true status: SUPPORTED entry_schema: *id011 + port_vson_server_oam_net_port_10_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED oam_net_id: type: string description: The ID of the OAM network. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_order: + port_vson_server_oam_net_port_10_order: type: integer required: true status: SUPPORTED - port_vson_server_oam_net_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED vson_vm_names: type: list description: A list of unique names to be issued to the vSON Cluster leaders. required: true status: SUPPORTED entry_schema: *id012 + port_vson_server_oam_net_port_10_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_vson_server_oam_net_port_10_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements requirements: - - dependency_vson_server: + - dependency_vson_server_3: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_vson_server: + - local_storage_vson_server_3: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage relationship: tosca.relationships.AttachesTo occurrences: - 0 - UNBOUNDED - - dependency_vson_server_oam_net_port_0: + - dependency_vson_server_oam_net_port_10: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vson_server_oam_net_port_0: + - link_vson_server_oam_net_port_10: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - disk.write.bytes_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + endpoint_vson_server_3: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.device.allocation_vson_server: + disk.read.bytes_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_vson_server_oam_net_port_0: + disk.read.requests_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.usage_vson_server: + network.incoming.packets.rate_vson_server_oam_net_port_10: type: org.openecomp.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_vson_server_oam_net_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. + binding_vson_server_3: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - disk.device.latency_vson_server: + disk.read.bytes.rate_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_vson_server: + disk.device.write.bytes_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests_vson_server: + instance_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory_vson_server: + disk.latency_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.latency_vson_server: + cpu_util_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - os_vson_server: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - feature_vson_server_oam_net_port_0: + feature_vson_server_oam_net_port_10: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - instance_vson_server: + disk.write.requests_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_vson_server: + memory_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_vson_server_oam_net_port_0: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - disk.iops_vson_server: + network.outgoing.bytes.rate_vson_server_oam_net_port_10: type: org.openecomp.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_vson_server_oam_net_port_0: + disk.device.read.requests.rate_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_vson_server: + disk.device.iops_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_vson_server: + disk.capacity_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - endpoint_vson_server: - type: tosca.capabilities.Endpoint.Admin + memory.usage_vson_server_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - vcpus_vson_server: + disk.usage_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_vson_server_oam_net_port_0: + disk.device.read.bytes.rate_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_vson_server: + network.outgoing.packets.rate_vson_server_oam_net_port_10: type: org.openecomp.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_vson_server: + disk.allocation_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.capacity_vson_server: + disk.write.requests.rate_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_vson_server: + disk.ephemeral.size_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.iops_vson_server: + network.incoming.bytes.rate_vson_server_oam_net_port_10: type: org.openecomp.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_vson_server: + disk.device.read.bytes_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_vson_server_oam_net_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. + binding_vson_server_oam_net_port_10: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + os_vson_server_3: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - disk.read.bytes_vson_server: + disk.root.size_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_vson_server: + disk.device.write.bytes.rate_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests_vson_server: + disk.device.write.requests_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_vson_server_oam_net_port_0: + network.incoming.packets_vson_server_oam_net_port_10: type: org.openecomp.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_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + host_vson_server_3: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_vson_server: + disk.device.latency_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.resident_vson_server: + cpu.delta_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_vson_server: + memory.resident_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - scalable_vson_server: - type: tosca.capabilities.Scalable + attachment_vson_server_oam_net_port_10: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_vson_server_oam_net_port_0: + network.incoming.bytes_vson_server_oam_net_port_10: type: org.openecomp.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_vson_server: + feature_vson_server_3: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.usage_vson_server: + disk.device.read.requests_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_util_vson_server: + network.outpoing.packets_vson_server_oam_net_port_10: type: org.openecomp.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_vson_server: + disk.device.usage_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu.delta_vson_server: + disk.device.write.requests.rate_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_vson_server: + vcpus_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_vson_server: - type: tosca.capabilities.Node + disk.write.bytes.rate_vson_server_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.allocation_vson_server: + disk.iops_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_vson_server: - type: tosca.capabilities.network.Bindable + scalable_vson_server_3: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - host_vson_server: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + disk.device.capacity_vson_server_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_vson_server_oam_net_port_0: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + disk.device.allocation_vson_server_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - network.incoming.bytes.rate_vson_server_oam_net_port_0: + cpu_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.requests_vson_server: + network.outgoing.bytes_vson_server_oam_net_port_10: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2531,12 +2531,10 @@ node_types: description: Default gateway. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_ip_requirements: - type: list + port_vson_server_oam_net_port_00_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements instance_index: type: float description: Index of the instance. @@ -2552,6 +2550,12 @@ node_types: description: Prefix length of the subnet on the OAM network. required: true status: SUPPORTED + port_vson_server_oam_net_port_00_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vf_module_name: type: string description: Unique name for this VF module instance. @@ -2579,23 +2583,11 @@ node_types: description: Unique ID for this VF instance. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_network_role: - type: string - required: true - status: SUPPORTED vson_clm_oam_net_ip: type: string description: IP of the vSON Cluster Manager. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_vson_server_oam_net_port_0_subnetpoolid: - type: string - required: true - status: SUPPORTED vson_dc_unit: type: string description: Name of the vSON Data Center. @@ -2618,6 +2610,10 @@ node_types: Swift account auth token. Example: 041a5187bb4641f9b89583e2539776b0 required: true status: SUPPORTED + port_vson_server_oam_net_port_00_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED vson_server_group_id: type: string description: | @@ -2629,16 +2625,6 @@ node_types: description: The ID or name of the flavor to boot onto. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_network_role_tag: - type: string - required: true - status: SUPPORTED - port_vson_server_oam_net_port_0_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements availability_zones: type: list description: List of availability zones. @@ -2663,17 +2649,27 @@ node_types: \ a new Datacenter/vSON member to existing vSON Cluster. \n" required: true status: SUPPORTED + port_vson_server_oam_net_port_00_order: + type: integer + required: true + status: SUPPORTED + port_vson_server_oam_net_port_00_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED oam_net_id: type: string description: The ID of the OAM network. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_order: - type: integer + port_vson_server_oam_net_port_00_vlan_requirements: + type: list required: true status: SUPPORTED - port_vson_server_oam_net_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_vson_server_oam_net_port_00_network_role: + type: string required: true status: SUPPORTED vson_vm_names: @@ -2682,337 +2678,341 @@ node_types: required: true status: SUPPORTED entry_schema: *id006 + port_vson_server_oam_net_port_00_subnetpoolid: + type: string + required: true + status: SUPPORTED requirements: - - dependency_vson_server: + - dependency_vson_server_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_vson_server: + - local_storage_vson_server_2: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage relationship: tosca.relationships.AttachesTo occurrences: - 0 - UNBOUNDED - - dependency_vson_server_oam_net_port_0: + - dependency_vson_server_oam_net_port_00: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vson_server_oam_net_port_0: + - link_vson_server_oam_net_port_00: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - disk.write.bytes_vson_server: + network.outpoing.packets_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.allocation_vson_server: + network.outgoing.bytes.rate_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_vson_server_oam_net_port_0: + instance_vson_server_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_vson_server: + disk.device.write.bytes_vson_server_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_vson_server_oam_net_port_0: + disk.read.requests_vson_server_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_vson_server: + disk.read.bytes_vson_server_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_vson_server: + network.outgoing.packets.rate_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests_vson_server: + disk.latency_vson_server_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_vson_server: + disk.read.bytes.rate_vson_server_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_vson_server: + endpoint_vson_server_2: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - os_vson_server: - type: tosca.capabilities.OperatingSystem + disk.write.requests_vson_server_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_vson_server_oam_net_port_0: - type: tosca.capabilities.Node + binding_vson_server_oam_net_port_00: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - instance_vson_server: + memory_vson_server_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_vson_server: + network.outgoing.bytes_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_vson_server_oam_net_port_0: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - disk.iops_vson_server: + cpu_util_vson_server_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_vson_server_oam_net_port_0: + disk.device.read.requests.rate_vson_server_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_vson_server: + disk.device.iops_vson_server_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_vson_server: + disk.allocation_vson_server_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 - endpoint_vson_server: - type: tosca.capabilities.Endpoint.Admin + memory.usage_vson_server_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_vson_server: + disk.usage_vson_server_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_vson_server_oam_net_port_0: + network.incoming.packets_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_vson_server: + disk.capacity_vson_server_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_vson_server: + disk.device.read.bytes.rate_vson_server_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_vson_server: + network.incoming.packets.rate_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_vson_server: + network.incoming.bytes_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.iops_vson_server: + disk.write.requests.rate_vson_server_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_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_vson_server_oam_net_port_00: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outpoing.packets_vson_server_oam_net_port_0: + disk.ephemeral.size_vson_server_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_vson_server: + disk.device.read.bytes_vson_server_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_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + os_vson_server_2: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - disk.device.write.requests_vson_server: + disk.root.size_vson_server_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_vson_server_oam_net_port_0: + disk.device.write.requests_vson_server_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_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + host_vson_server_2: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_vson_server: + disk.device.write.bytes.rate_vson_server_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_vson_server: + cpu.delta_vson_server_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_vson_server: + disk.device.latency_vson_server_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_vson_server: - type: tosca.capabilities.Scalable + feature_vson_server_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_vson_server_oam_net_port_0: + memory.resident_vson_server_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_vson_server: + disk.write.bytes_vson_server_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_vson_server: + disk.device.usage_vson_server_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_vson_server: + disk.device.write.requests.rate_vson_server_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_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_vson_server_2: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - cpu.delta_vson_server: + vcpus_vson_server_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_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_vson_server_2: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - feature_vson_server: - type: tosca.capabilities.Node + disk.write.bytes.rate_vson_server_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_vson_server: + disk.iops_vson_server_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_vson_server: - type: tosca.capabilities.network.Bindable + cpu_vson_server_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_vson_server: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + feature_vson_server_oam_net_port_00: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - binding_vson_server_oam_net_port_0: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + disk.device.allocation_vson_server_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: - - 0 + - 1 - UNBOUNDED - network.incoming.bytes.rate_vson_server_oam_net_port_0: + disk.device.read.requests_vson_server_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_vson_server: + disk.device.capacity_vson_server_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: @@ -3031,12 +3031,10 @@ node_types: description: Default gateway. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_ip_requirements: - type: list + port_vson_server_oam_net_port_00_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements instance_index: type: float description: Index of the instance. @@ -3052,6 +3050,12 @@ node_types: description: Prefix length of the subnet on the OAM network. required: true status: SUPPORTED + port_vson_server_oam_net_port_00_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vf_module_name: type: string description: Unique name for this VF module instance. @@ -3079,23 +3083,11 @@ node_types: description: Unique ID for this VF instance. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_network_role: - type: string - required: true - status: SUPPORTED vson_clm_oam_net_ip: type: string description: IP of the vSON Cluster Manager. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_vson_server_oam_net_port_0_subnetpoolid: - type: string - required: true - status: SUPPORTED vson_dc_unit: type: string description: Name of the vSON Data Center. @@ -3118,6 +3110,10 @@ node_types: Swift account auth token. Example: 041a5187bb4641f9b89583e2539776b0 required: true status: SUPPORTED + port_vson_server_oam_net_port_00_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED vson_server_group_id: type: string description: | @@ -3129,16 +3125,6 @@ node_types: description: The ID or name of the flavor to boot onto. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_network_role_tag: - type: string - required: true - status: SUPPORTED - port_vson_server_oam_net_port_0_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements availability_zones: type: list description: List of availability zones. @@ -3163,17 +3149,27 @@ node_types: \ a new Datacenter/vSON member to existing vSON Cluster. \n" required: true status: SUPPORTED + port_vson_server_oam_net_port_00_order: + type: integer + required: true + status: SUPPORTED + port_vson_server_oam_net_port_00_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED oam_net_id: type: string description: The ID of the OAM network. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_order: - type: integer + port_vson_server_oam_net_port_00_vlan_requirements: + type: list required: true status: SUPPORTED - port_vson_server_oam_net_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_vson_server_oam_net_port_00_network_role: + type: string required: true status: SUPPORTED vson_vm_names: @@ -3182,337 +3178,341 @@ node_types: required: true status: SUPPORTED entry_schema: *id006 + port_vson_server_oam_net_port_00_subnetpoolid: + type: string + required: true + status: SUPPORTED requirements: - - dependency_vson_server: + - dependency_vson_server_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_vson_server: + - local_storage_vson_server_2: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage relationship: tosca.relationships.AttachesTo occurrences: - 0 - UNBOUNDED - - dependency_vson_server_oam_net_port_0: + - dependency_vson_server_oam_net_port_00: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vson_server_oam_net_port_0: + - link_vson_server_oam_net_port_00: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - disk.write.bytes_vson_server: + network.outpoing.packets_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.allocation_vson_server: + network.outgoing.bytes.rate_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_vson_server_oam_net_port_0: + instance_vson_server_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_vson_server: + disk.device.write.bytes_vson_server_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_vson_server_oam_net_port_0: + disk.read.requests_vson_server_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_vson_server: + disk.read.bytes_vson_server_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_vson_server: + network.outgoing.packets.rate_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests_vson_server: + disk.latency_vson_server_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_vson_server: + disk.read.bytes.rate_vson_server_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_vson_server: + endpoint_vson_server_2: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - os_vson_server: - type: tosca.capabilities.OperatingSystem + disk.write.requests_vson_server_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_vson_server_oam_net_port_0: - type: tosca.capabilities.Node + binding_vson_server_oam_net_port_00: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - instance_vson_server: + memory_vson_server_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_vson_server: + network.outgoing.bytes_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_vson_server_oam_net_port_0: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - disk.iops_vson_server: + cpu_util_vson_server_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_vson_server_oam_net_port_0: + disk.device.read.requests.rate_vson_server_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_vson_server: + disk.device.iops_vson_server_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_vson_server: + disk.allocation_vson_server_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 - endpoint_vson_server: - type: tosca.capabilities.Endpoint.Admin + memory.usage_vson_server_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_vson_server: + disk.usage_vson_server_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_vson_server_oam_net_port_0: + network.incoming.packets_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_vson_server: + disk.capacity_vson_server_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_vson_server: + disk.device.read.bytes.rate_vson_server_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_vson_server: + network.incoming.packets.rate_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_vson_server: + network.incoming.bytes_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.iops_vson_server: + disk.write.requests.rate_vson_server_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_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_vson_server_oam_net_port_00: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outpoing.packets_vson_server_oam_net_port_0: + disk.ephemeral.size_vson_server_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_vson_server: + disk.device.read.bytes_vson_server_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_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + os_vson_server_2: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - disk.device.write.requests_vson_server: + disk.root.size_vson_server_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_vson_server_oam_net_port_0: + disk.device.write.requests_vson_server_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_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + host_vson_server_2: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_vson_server: + disk.device.write.bytes.rate_vson_server_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_vson_server: + cpu.delta_vson_server_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_vson_server: + disk.device.latency_vson_server_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_vson_server: - type: tosca.capabilities.Scalable + feature_vson_server_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_vson_server_oam_net_port_0: + memory.resident_vson_server_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_vson_server: + disk.write.bytes_vson_server_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_vson_server: + disk.device.usage_vson_server_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_vson_server: + disk.device.write.requests.rate_vson_server_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_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_vson_server_2: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - cpu.delta_vson_server: + vcpus_vson_server_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_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_vson_server_2: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - feature_vson_server: - type: tosca.capabilities.Node + disk.write.bytes.rate_vson_server_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_vson_server: + disk.iops_vson_server_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_vson_server: - type: tosca.capabilities.network.Bindable + cpu_vson_server_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_vson_server: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + feature_vson_server_oam_net_port_00: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - binding_vson_server_oam_net_port_0: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + disk.device.allocation_vson_server_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: - - 0 + - 1 - UNBOUNDED - network.incoming.bytes.rate_vson_server_oam_net_port_0: + disk.device.read.requests_vson_server_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_vson_server: + disk.device.capacity_vson_server_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: @@ -3531,12 +3531,10 @@ node_types: description: Default gateway. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_ip_requirements: - type: list + port_vson_server_oam_net_port_00_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements instance_index: type: float description: Index of the instance. @@ -3552,6 +3550,12 @@ node_types: description: Prefix length of the subnet on the OAM network. required: true status: SUPPORTED + port_vson_server_oam_net_port_00_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vf_module_name: type: string description: Unique name for this VF module instance. @@ -3579,23 +3583,11 @@ node_types: description: Unique ID for this VF instance. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_network_role: - type: string - required: true - status: SUPPORTED vson_clm_oam_net_ip: type: string description: IP of the vSON Cluster Manager. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_vson_server_oam_net_port_0_subnetpoolid: - type: string - required: true - status: SUPPORTED vson_dc_unit: type: string description: Name of the vSON Data Center. @@ -3618,6 +3610,10 @@ node_types: Swift account auth token. Example: 041a5187bb4641f9b89583e2539776b0 required: true status: SUPPORTED + port_vson_server_oam_net_port_00_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED vson_server_group_id: type: string description: | @@ -3629,16 +3625,6 @@ node_types: description: The ID or name of the flavor to boot onto. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_network_role_tag: - type: string - required: true - status: SUPPORTED - port_vson_server_oam_net_port_0_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements availability_zones: type: list description: List of availability zones. @@ -3663,17 +3649,27 @@ node_types: \ a new Datacenter/vSON member to existing vSON Cluster. \n" required: true status: SUPPORTED + port_vson_server_oam_net_port_00_order: + type: integer + required: true + status: SUPPORTED + port_vson_server_oam_net_port_00_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED oam_net_id: type: string description: The ID of the OAM network. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_order: - type: integer + port_vson_server_oam_net_port_00_vlan_requirements: + type: list required: true status: SUPPORTED - port_vson_server_oam_net_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_vson_server_oam_net_port_00_network_role: + type: string required: true status: SUPPORTED vson_vm_names: @@ -3682,337 +3678,341 @@ node_types: required: true status: SUPPORTED entry_schema: *id006 + port_vson_server_oam_net_port_00_subnetpoolid: + type: string + required: true + status: SUPPORTED requirements: - - dependency_vson_server: + - dependency_vson_server_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_vson_server: + - local_storage_vson_server_2: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage relationship: tosca.relationships.AttachesTo occurrences: - 0 - UNBOUNDED - - dependency_vson_server_oam_net_port_0: + - dependency_vson_server_oam_net_port_00: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vson_server_oam_net_port_0: + - link_vson_server_oam_net_port_00: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - disk.write.bytes_vson_server: + network.outpoing.packets_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.allocation_vson_server: + network.outgoing.bytes.rate_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_vson_server_oam_net_port_0: + instance_vson_server_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_vson_server: + disk.device.write.bytes_vson_server_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_vson_server_oam_net_port_0: + disk.read.requests_vson_server_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_vson_server: + disk.read.bytes_vson_server_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_vson_server: + network.outgoing.packets.rate_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests_vson_server: + disk.latency_vson_server_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_vson_server: + disk.read.bytes.rate_vson_server_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_vson_server: + endpoint_vson_server_2: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - os_vson_server: - type: tosca.capabilities.OperatingSystem + disk.write.requests_vson_server_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_vson_server_oam_net_port_0: - type: tosca.capabilities.Node + binding_vson_server_oam_net_port_00: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - instance_vson_server: + memory_vson_server_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_vson_server: + network.outgoing.bytes_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_vson_server_oam_net_port_0: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - disk.iops_vson_server: + cpu_util_vson_server_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_vson_server_oam_net_port_0: + disk.device.read.requests.rate_vson_server_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_vson_server: + disk.device.iops_vson_server_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_vson_server: + disk.allocation_vson_server_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 - endpoint_vson_server: - type: tosca.capabilities.Endpoint.Admin + memory.usage_vson_server_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_vson_server: + disk.usage_vson_server_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_vson_server_oam_net_port_0: + network.incoming.packets_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_vson_server: + disk.capacity_vson_server_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_vson_server: + disk.device.read.bytes.rate_vson_server_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_vson_server: + network.incoming.packets.rate_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_vson_server: + network.incoming.bytes_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.iops_vson_server: + disk.write.requests.rate_vson_server_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_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_vson_server_oam_net_port_00: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outpoing.packets_vson_server_oam_net_port_0: + disk.ephemeral.size_vson_server_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_vson_server: + disk.device.read.bytes_vson_server_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_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + os_vson_server_2: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - disk.device.write.requests_vson_server: + disk.root.size_vson_server_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_vson_server_oam_net_port_0: + disk.device.write.requests_vson_server_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_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + host_vson_server_2: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_vson_server: + disk.device.write.bytes.rate_vson_server_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_vson_server: + cpu.delta_vson_server_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_vson_server: + disk.device.latency_vson_server_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_vson_server: - type: tosca.capabilities.Scalable + feature_vson_server_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_vson_server_oam_net_port_0: + memory.resident_vson_server_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_vson_server: + disk.write.bytes_vson_server_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_vson_server: + disk.device.usage_vson_server_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_vson_server: + disk.device.write.requests.rate_vson_server_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_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_vson_server_2: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - cpu.delta_vson_server: + vcpus_vson_server_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_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_vson_server_2: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - feature_vson_server: - type: tosca.capabilities.Node + disk.write.bytes.rate_vson_server_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_vson_server: + disk.iops_vson_server_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_vson_server: - type: tosca.capabilities.network.Bindable + cpu_vson_server_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_vson_server: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + feature_vson_server_oam_net_port_00: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - binding_vson_server_oam_net_port_0: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + disk.device.allocation_vson_server_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: - - 0 + - 1 - UNBOUNDED - network.incoming.bytes.rate_vson_server_oam_net_port_0: + disk.device.read.requests_vson_server_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_vson_server: + disk.device.capacity_vson_server_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: @@ -4036,12 +4036,6 @@ node_types: description: Default gateway. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements instance_index: type: float description: Index of the instance. @@ -4075,6 +4069,12 @@ node_types: status: SUPPORTED entry_schema: &id013 type: string + port_vson_server_oam_net_port_20_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements oam_net_security_group_id: type: string description: | @@ -4091,7 +4091,7 @@ node_types: description: Unique ID for this VF instance. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_network_role: + port_vson_server_oam_net_port_20_network_role_tag: type: string required: true status: SUPPORTED @@ -4100,14 +4100,6 @@ node_types: description: IP of the vSON Cluster Manager. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_vson_server_oam_net_port_0_subnetpoolid: - type: string - required: true - status: SUPPORTED oam_net_ips: type: list description: Fixed IP assignments for vSON instances on the OAM network. @@ -4142,16 +4134,10 @@ node_types: description: The ID or name of the flavor to boot onto. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_network_role_tag: - type: string - required: true - status: SUPPORTED - port_vson_server_oam_net_port_0_vlan_requirements: - type: list + port_vson_server_oam_net_port_20_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements availability_zones: type: list description: List of availability zones. @@ -4166,19 +4152,33 @@ node_types: status: SUPPORTED entry_schema: &id016 type: string + port_vson_server_oam_net_port_20_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_vson_server_oam_net_port_20_network_role: + type: string + required: true + status: SUPPORTED + port_vson_server_oam_net_port_20_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vson_server_oam_net_port_20_subnetpoolid: + type: string + required: true + status: SUPPORTED oam_net_id: type: string description: The ID of the OAM network. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_order: + port_vson_server_oam_net_port_20_order: type: integer required: true status: SUPPORTED - port_vson_server_oam_net_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED vson_vm_names: type: list description: A list of unique names to be issued to the vSON Cluster leaders. @@ -4187,336 +4187,336 @@ node_types: entry_schema: &id017 type: string requirements: - - dependency_vson_server: + - dependency_vson_server_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_vson_server: + - local_storage_vson_server_1: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage relationship: tosca.relationships.AttachesTo occurrences: - 0 - UNBOUNDED - - dependency_vson_server_oam_net_port_0: + - dependency_vson_server_oam_net_port_20: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vson_server_oam_net_port_0: + - link_vson_server_oam_net_port_20: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - disk.write.bytes_vson_server: + instance_vson_server_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_vson_server: + disk.device.write.bytes_vson_server_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_vson_server_oam_net_port_0: + disk.read.requests_vson_server_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_vson_server: + disk.read.bytes_vson_server_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_vson_server_oam_net_port_0: + disk.read.bytes.rate_vson_server_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_vson_server: + disk.latency_vson_server_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.rate_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + endpoint_vson_server_1: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.device.read.requests_vson_server: + disk.write.requests_vson_server_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_vson_server: + memory_vson_server_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_vson_server: + cpu_util_vson_server_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_vson_server: - type: tosca.capabilities.OperatingSystem + disk.device.read.requests.rate_vson_server_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_vson_server_oam_net_port_0: - type: tosca.capabilities.Node + disk.device.iops_vson_server_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_vson_server: + disk.usage_vson_server_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_vson_server: + disk.allocation_vson_server_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_vson_server_oam_net_port_0: - type: tosca.capabilities.Attachment + disk.capacity_vson_server_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_vson_server: + memory.usage_vson_server_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_vson_server_oam_net_port_0: + disk.device.read.bytes.rate_vson_server_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_vson_server: + disk.write.requests.rate_vson_server_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_vson_server: + disk.ephemeral.size_vson_server_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_vson_server: - type: tosca.capabilities.Endpoint.Admin + feature_vson_server_oam_net_port_20: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - vcpus_vson_server: + disk.device.read.bytes_vson_server_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_vson_server_oam_net_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. + os_vson_server_1: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_vson_server_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_vson_server: + network.outpoing.packets_vson_server_oam_net_port_20: type: org.openecomp.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_vson_server: + network.outgoing.bytes.rate_vson_server_oam_net_port_20: type: org.openecomp.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_vson_server: + disk.root.size_vson_server_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_vson_server: + network.outgoing.packets.rate_vson_server_oam_net_port_20: type: org.openecomp.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_vson_server: + disk.device.write.requests_vson_server_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_vson_server_oam_net_port_0: + disk.device.write.bytes.rate_vson_server_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_vson_server: + host_vson_server_1: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent + occurrences: + - 1 + - UNBOUNDED + disk.device.latency_vson_server_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_vson_server: + cpu.delta_vson_server_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_vson_server: + network.outgoing.bytes_vson_server_oam_net_port_20: type: org.openecomp.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_vson_server_oam_net_port_0: + network.incoming.bytes.rate_vson_server_oam_net_port_20: type: org.openecomp.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_vson_server: + memory.resident_vson_server_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_vson_server: + binding_vson_server_oam_net_port_20: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.write.bytes_vson_server_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_vson_server: + disk.device.usage_vson_server_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_vson_server: + disk.device.write.requests.rate_vson_server_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_vson_server: + scalable_vson_server_1: type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_vson_server_oam_net_port_0: + network.incoming.packets_vson_server_oam_net_port_20: type: org.openecomp.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_vson_server: + vcpus_vson_server_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_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_vson_server_1: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - cpu_util_vson_server: + network.incoming.packets.rate_vson_server_oam_net_port_20: type: org.openecomp.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_vson_server: + disk.iops_vson_server_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_vson_server: + disk.write.bytes.rate_vson_server_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_vson_server: + network.incoming.bytes_vson_server_oam_net_port_20: type: org.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_vson_server: - type: tosca.capabilities.Node + attachment_vson_server_oam_net_port_20: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.allocation_vson_server: + disk.device.allocation_vson_server_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_vson_server: - type: tosca.capabilities.network.Bindable - occurrences: - - 1 - - UNBOUNDED - host_vson_server: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + cpu_vson_server_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_vson_server_oam_net_port_0: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - network.incoming.bytes.rate_vson_server_oam_net_port_0: + disk.device.read.requests_vson_server_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_vson_server: + disk.device.capacity_vson_server_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: @@ -4540,12 +4540,6 @@ node_types: description: Default gateway. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements instance_index: type: float description: Index of the instance. @@ -4578,6 +4572,12 @@ node_types: required: true status: SUPPORTED entry_schema: *id013 + port_vson_server_oam_net_port_20_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements oam_net_security_group_id: type: string description: | @@ -4594,7 +4594,7 @@ node_types: description: Unique ID for this VF instance. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_network_role: + port_vson_server_oam_net_port_20_network_role_tag: type: string required: true status: SUPPORTED @@ -4603,14 +4603,6 @@ node_types: description: IP of the vSON Cluster Manager. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_vson_server_oam_net_port_0_subnetpoolid: - type: string - required: true - status: SUPPORTED oam_net_ips: type: list description: Fixed IP assignments for vSON instances on the OAM network. @@ -4644,16 +4636,10 @@ node_types: description: The ID or name of the flavor to boot onto. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_network_role_tag: - type: string - required: true - status: SUPPORTED - port_vson_server_oam_net_port_0_vlan_requirements: - type: list + port_vson_server_oam_net_port_20_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements availability_zones: type: list description: List of availability zones. @@ -4666,19 +4652,33 @@ node_types: required: true status: SUPPORTED entry_schema: *id016 + port_vson_server_oam_net_port_20_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_vson_server_oam_net_port_20_network_role: + type: string + required: true + status: SUPPORTED + port_vson_server_oam_net_port_20_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vson_server_oam_net_port_20_subnetpoolid: + type: string + required: true + status: SUPPORTED oam_net_id: type: string description: The ID of the OAM network. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_order: + port_vson_server_oam_net_port_20_order: type: integer required: true status: SUPPORTED - port_vson_server_oam_net_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED vson_vm_names: type: list description: A list of unique names to be issued to the vSON Cluster leaders. @@ -4686,336 +4686,336 @@ node_types: status: SUPPORTED entry_schema: *id017 requirements: - - dependency_vson_server: + - dependency_vson_server_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_vson_server: + - local_storage_vson_server_1: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage relationship: tosca.relationships.AttachesTo occurrences: - 0 - UNBOUNDED - - dependency_vson_server_oam_net_port_0: + - dependency_vson_server_oam_net_port_20: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vson_server_oam_net_port_0: + - link_vson_server_oam_net_port_20: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - disk.write.bytes_vson_server: + instance_vson_server_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_vson_server: + disk.device.write.bytes_vson_server_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_vson_server_oam_net_port_0: + disk.read.requests_vson_server_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_vson_server: + disk.read.bytes_vson_server_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_vson_server_oam_net_port_0: + disk.read.bytes.rate_vson_server_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_vson_server: + disk.latency_vson_server_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.rate_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + endpoint_vson_server_1: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.device.read.requests_vson_server: + disk.write.requests_vson_server_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_vson_server: + memory_vson_server_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_vson_server: + cpu_util_vson_server_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_vson_server: - type: tosca.capabilities.OperatingSystem + disk.device.read.requests.rate_vson_server_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_vson_server_oam_net_port_0: - type: tosca.capabilities.Node + disk.device.iops_vson_server_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_vson_server: + disk.usage_vson_server_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_vson_server: + disk.allocation_vson_server_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_vson_server_oam_net_port_0: - type: tosca.capabilities.Attachment + disk.capacity_vson_server_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_vson_server: + memory.usage_vson_server_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_vson_server_oam_net_port_0: + disk.device.read.bytes.rate_vson_server_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_vson_server: + disk.write.requests.rate_vson_server_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_vson_server: + disk.ephemeral.size_vson_server_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_vson_server: - type: tosca.capabilities.Endpoint.Admin + feature_vson_server_oam_net_port_20: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - vcpus_vson_server: + disk.device.read.bytes_vson_server_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_vson_server_oam_net_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. + os_vson_server_1: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_vson_server_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_vson_server: + network.outpoing.packets_vson_server_oam_net_port_20: type: org.openecomp.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_vson_server: + network.outgoing.bytes.rate_vson_server_oam_net_port_20: type: org.openecomp.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_vson_server: + disk.root.size_vson_server_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_vson_server: + network.outgoing.packets.rate_vson_server_oam_net_port_20: type: org.openecomp.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_vson_server: + disk.device.write.requests_vson_server_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_vson_server_oam_net_port_0: + disk.device.write.bytes.rate_vson_server_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_vson_server: + host_vson_server_1: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent + occurrences: + - 1 + - UNBOUNDED + disk.device.latency_vson_server_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_vson_server: + cpu.delta_vson_server_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_vson_server: + network.outgoing.bytes_vson_server_oam_net_port_20: type: org.openecomp.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_vson_server_oam_net_port_0: + network.incoming.bytes.rate_vson_server_oam_net_port_20: type: org.openecomp.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_vson_server: + memory.resident_vson_server_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_vson_server: + binding_vson_server_oam_net_port_20: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.write.bytes_vson_server_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_vson_server: + disk.device.usage_vson_server_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_vson_server: + disk.device.write.requests.rate_vson_server_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_vson_server: + scalable_vson_server_1: type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_vson_server_oam_net_port_0: + network.incoming.packets_vson_server_oam_net_port_20: type: org.openecomp.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_vson_server: + vcpus_vson_server_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_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_vson_server_1: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - cpu_util_vson_server: + network.incoming.packets.rate_vson_server_oam_net_port_20: type: org.openecomp.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_vson_server: + disk.iops_vson_server_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_vson_server: + disk.write.bytes.rate_vson_server_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_vson_server: + network.incoming.bytes_vson_server_oam_net_port_20: type: org.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_vson_server: - type: tosca.capabilities.Node + attachment_vson_server_oam_net_port_20: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.allocation_vson_server: + disk.device.allocation_vson_server_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_vson_server: - type: tosca.capabilities.network.Bindable - occurrences: - - 1 - - UNBOUNDED - host_vson_server: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + cpu_vson_server_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_vson_server_oam_net_port_0: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - network.incoming.bytes.rate_vson_server_oam_net_port_0: + disk.device.read.requests_vson_server_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_vson_server: + disk.device.capacity_vson_server_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: @@ -5034,12 +5034,6 @@ node_types: description: Default gateway. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements instance_index: type: float description: Index of the instance. @@ -5050,11 +5044,21 @@ node_types: description: Unique name for this VF instance. required: true status: SUPPORTED + port_vson_server_oam_net_port_10_network_role: + type: string + required: true + status: SUPPORTED oam_net_subnet_prefix_length: type: string description: Prefix length of the subnet on the OAM network. required: true status: SUPPORTED + port_vson_server_oam_net_port_10_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vf_module_name: type: string description: Unique name for this VF module instance. @@ -5077,20 +5081,12 @@ node_types: description: Unique ID for this VF instance. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_network_role: - type: string - required: true - status: SUPPORTED vson_clm_oam_net_ip: type: string description: IP of the vSON Cluster Manager. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_vson_server_oam_net_port_0_subnetpoolid: + port_vson_server_oam_net_port_10_subnetpoolid: type: string required: true status: SUPPORTED @@ -5127,16 +5123,6 @@ node_types: description: The ID or name of the flavor to boot onto. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_network_role_tag: - type: string - required: true - status: SUPPORTED - port_vson_server_oam_net_port_0_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements availability_zones: type: list description: List of availability zones. @@ -5149,364 +5135,378 @@ node_types: required: true status: SUPPORTED entry_schema: *id010 + port_vson_server_oam_net_port_10_network_role_tag: + type: string + required: true + status: SUPPORTED ntp_servers: type: list description: List of NTP servers. required: true status: SUPPORTED entry_schema: *id011 + port_vson_server_oam_net_port_10_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED oam_net_id: type: string description: The ID of the OAM network. required: true status: SUPPORTED - port_vson_server_oam_net_port_0_order: + port_vson_server_oam_net_port_10_order: type: integer required: true status: SUPPORTED - port_vson_server_oam_net_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED vson_vm_names: type: list description: A list of unique names to be issued to the vSON Cluster leaders. required: true status: SUPPORTED entry_schema: *id012 + port_vson_server_oam_net_port_10_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_vson_server_oam_net_port_10_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements requirements: - - dependency_vson_server: + - dependency_vson_server_3: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_vson_server: + - local_storage_vson_server_3: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage relationship: tosca.relationships.AttachesTo occurrences: - 0 - UNBOUNDED - - dependency_vson_server_oam_net_port_0: + - dependency_vson_server_oam_net_port_10: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vson_server_oam_net_port_0: + - link_vson_server_oam_net_port_10: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - disk.write.bytes_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + endpoint_vson_server_3: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.device.allocation_vson_server: + disk.read.bytes_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_vson_server_oam_net_port_0: + disk.read.requests_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.usage_vson_server: + network.incoming.packets.rate_vson_server_oam_net_port_10: type: org.openecomp.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_vson_server_oam_net_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. + binding_vson_server_3: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - disk.device.latency_vson_server: + disk.read.bytes.rate_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_vson_server: + disk.device.write.bytes_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests_vson_server: + instance_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory_vson_server: + disk.latency_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.latency_vson_server: + cpu_util_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - os_vson_server: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - feature_vson_server_oam_net_port_0: + feature_vson_server_oam_net_port_10: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - instance_vson_server: + disk.write.requests_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_vson_server: + memory_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_vson_server_oam_net_port_0: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - disk.iops_vson_server: + network.outgoing.bytes.rate_vson_server_oam_net_port_10: type: org.openecomp.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_vson_server_oam_net_port_0: + disk.device.read.requests.rate_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_vson_server: + disk.device.iops_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_vson_server: + disk.capacity_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - endpoint_vson_server: - type: tosca.capabilities.Endpoint.Admin + memory.usage_vson_server_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - vcpus_vson_server: + disk.usage_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_vson_server_oam_net_port_0: + disk.device.read.bytes.rate_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_vson_server: + network.outgoing.packets.rate_vson_server_oam_net_port_10: type: org.openecomp.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_vson_server: + disk.allocation_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.capacity_vson_server: + disk.write.requests.rate_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_vson_server: + disk.ephemeral.size_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.iops_vson_server: + network.incoming.bytes.rate_vson_server_oam_net_port_10: type: org.openecomp.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_vson_server: + disk.device.read.bytes_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_vson_server_oam_net_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. + binding_vson_server_oam_net_port_10: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + os_vson_server_3: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - disk.read.bytes_vson_server: + disk.root.size_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_vson_server: + disk.device.write.bytes.rate_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests_vson_server: + disk.device.write.requests_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_vson_server_oam_net_port_0: + network.incoming.packets_vson_server_oam_net_port_10: type: org.openecomp.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_vson_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + host_vson_server_3: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_vson_server: + disk.device.latency_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.resident_vson_server: + cpu.delta_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_vson_server: + memory.resident_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - scalable_vson_server: - type: tosca.capabilities.Scalable + attachment_vson_server_oam_net_port_10: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_vson_server_oam_net_port_0: + network.incoming.bytes_vson_server_oam_net_port_10: type: org.openecomp.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_vson_server: + feature_vson_server_3: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.usage_vson_server: + disk.device.read.requests_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_util_vson_server: + network.outpoing.packets_vson_server_oam_net_port_10: type: org.openecomp.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_vson_server: + disk.device.usage_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu.delta_vson_server: + disk.device.write.requests.rate_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_vson_server: + vcpus_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_vson_server: - type: tosca.capabilities.Node + disk.write.bytes.rate_vson_server_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.allocation_vson_server: + disk.iops_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_vson_server: - type: tosca.capabilities.network.Bindable + scalable_vson_server_3: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - host_vson_server: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + disk.device.capacity_vson_server_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_vson_server_oam_net_port_0: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + disk.device.allocation_vson_server_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - network.incoming.bytes.rate_vson_server_oam_net_port_0: + cpu_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.requests_vson_server: + network.outgoing.bytes_vson_server_oam_net_port_10: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED + - UNBOUNDED
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml index e1fcf51fae..c36094adeb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml @@ -1009,12 +1009,6 @@ topology_template: get_input: vson_cluster_name default_gateway: get_input: default_gateway - port_vson_server_oam_net_port_0_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false instance_index: 0 vnf_name: get_input: vnf_name @@ -1033,11 +1027,9 @@ topology_template: get_input: vson_clm_image_name vnf_id: get_input: vnf_id + port_vson_server_oam_net_port_20_network_role_tag: oam vson_clm_oam_net_ip: get_input: vson_master_clm_ip - port_vson_server_oam_net_port_0_mac_requirements: - mac_count_required: - is_required: false oam_net_ips: - get_input: vson_clm_oam_net_ip_0 swift_son_container_name: @@ -1048,17 +1040,25 @@ topology_template: vson_server_group_id: UNSUPPORTED_RESOURCE_vson_clm_server_group vson_vm_flavor_name: get_input: vson_clm_flavor_name - port_vson_server_oam_net_port_0_network_role_tag: oam availability_zones: - get_input: availability_zone_0 ntp_servers: get_input: ntp_servers + port_vson_server_oam_net_port_20_mac_requirements: + mac_count_required: + is_required: false + port_vson_server_oam_net_port_20_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false oam_net_id: get_input: oam_net_id vson_vm_names: - get_input: vson_clm_name_0 requirements: - - dependency_vson_server: + - dependency_vson_server_1: capability: tosca.capabilities.Node node: oam_net_security_group relationship: tosca.relationships.DependsOn @@ -1071,12 +1071,6 @@ topology_template: get_input: vf_module_id default_gateway: get_input: default_gateway - port_vson_server_oam_net_port_0_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false instance_index: get_property: - SELF @@ -1101,9 +1095,6 @@ topology_template: get_input: vnf_id vson_clm_oam_net_ip: get_input: vson_clm_0_oam_net_ip_0 - port_vson_server_oam_net_port_0_mac_requirements: - mac_count_required: - is_required: false vson_dc_unit: get_input: vson_dc_unit oam_net_ips: @@ -1115,17 +1106,26 @@ topology_template: get_input: vson_mgt_server_group_id vson_vm_flavor_name: get_input: vson_mgt_flavor_name - port_vson_server_oam_net_port_0_network_role_tag: oam availability_zones: - get_input: availability_zone_0 volume_ids: - get_input: vson_mgt_volume_id_0 + port_vson_server_oam_net_port_10_network_role_tag: oam ntp_servers: get_input: ntp_servers oam_net_id: get_input: oam_net_id vson_vm_names: - get_input: vson_mgt_name_0 + port_vson_server_oam_net_port_10_mac_requirements: + mac_count_required: + is_required: false + port_vson_server_oam_net_port_10_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false vson_dbs_volume_1: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: @@ -1149,12 +1149,7 @@ topology_template: get_input: vf_module_id default_gateway: get_input: default_gateway - port_vson_server_oam_net_port_0_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + port_vson_server_oam_net_port_00_network_role_tag: oam instance_index: get_property: - SELF @@ -1164,6 +1159,12 @@ topology_template: get_input: vnf_name oam_net_subnet_prefix_length: get_input: oam_net_subnet_prefix_length + port_vson_server_oam_net_port_00_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false vf_module_name: get_input: vf_module_name dns_servers: @@ -1181,9 +1182,6 @@ topology_template: get_input: vnf_id vson_clm_oam_net_ip: get_input: vson_clm_0_oam_net_ip_0 - port_vson_server_oam_net_port_0_mac_requirements: - mac_count_required: - is_required: false vson_dc_unit: get_input: vson_dc_unit oam_net_ips: @@ -1191,11 +1189,13 @@ topology_template: vfc_role: dbc swift_account_auth_token: get_input: swift_account_auth_token + port_vson_server_oam_net_port_00_mac_requirements: + mac_count_required: + is_required: false vson_server_group_id: get_input: vson_dbc_server_group_id vson_vm_flavor_name: get_input: vson_dbc_flavor_name - port_vson_server_oam_net_port_0_network_role_tag: oam availability_zones: - get_input: availability_zone_0 volume_ids: @@ -1232,12 +1232,6 @@ topology_template: vson_cluster_name: '' default_gateway: get_input: default_gateway - port_vson_server_oam_net_port_0_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false instance_index: get_property: - SELF @@ -1263,11 +1257,9 @@ topology_template: get_input: vson_clm_image_name vnf_id: get_input: vnf_id + port_vson_server_oam_net_port_20_network_role_tag: oam vson_clm_oam_net_ip: get_input: vson_clm_0_oam_net_ip_0 - port_vson_server_oam_net_port_0_mac_requirements: - mac_count_required: - is_required: false oam_net_ips: - get_input: vson_clm_oam_net_ip_0 swift_son_container_name: '' @@ -1278,11 +1270,19 @@ topology_template: get_input: vson_clm_server_group_id vson_vm_flavor_name: get_input: vson_clm_flavor_name - port_vson_server_oam_net_port_0_network_role_tag: oam availability_zones: - get_input: availability_zone_0 ntp_servers: get_input: ntp_servers + port_vson_server_oam_net_port_20_mac_requirements: + mac_count_required: + is_required: false + port_vson_server_oam_net_port_20_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false oam_net_id: get_input: oam_net_id vson_vm_names: @@ -1350,12 +1350,6 @@ topology_template: get_input: vf_module_id default_gateway: get_input: default_gateway - port_vson_server_oam_net_port_0_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false instance_index: get_property: - SELF @@ -1380,9 +1374,6 @@ topology_template: get_input: vnf_id vson_clm_oam_net_ip: get_input: vson_clm_0_oam_net_ip_0 - port_vson_server_oam_net_port_0_mac_requirements: - mac_count_required: - is_required: false vson_dc_unit: get_input: vson_dc_unit oam_net_ips: @@ -1394,17 +1385,26 @@ topology_template: get_input: vson_mdr_server_group_id vson_vm_flavor_name: get_input: vson_mdr_flavor_name - port_vson_server_oam_net_port_0_network_role_tag: oam availability_zones: - get_input: availability_zone_0 volume_ids: - get_input: vson_mdr_volume_id_0 + port_vson_server_oam_net_port_10_network_role_tag: oam ntp_servers: get_input: ntp_servers oam_net_id: get_input: oam_net_id vson_vm_names: - get_input: vson_mdr_name_0 + port_vson_server_oam_net_port_10_mac_requirements: + mac_count_required: + is_required: false + port_vson_server_oam_net_port_10_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false vson_dbs_group: type: org.openecomp.resource.abstract.nodes.heat.vson_vm_1 directives: @@ -1414,12 +1414,7 @@ topology_template: get_input: vf_module_id default_gateway: get_input: default_gateway - port_vson_server_oam_net_port_0_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + port_vson_server_oam_net_port_00_network_role_tag: oam instance_index: get_property: - SELF @@ -1429,6 +1424,12 @@ topology_template: get_input: vnf_name oam_net_subnet_prefix_length: get_input: oam_net_subnet_prefix_length + port_vson_server_oam_net_port_00_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false vf_module_name: get_input: vf_module_name dns_servers: @@ -1446,9 +1447,6 @@ topology_template: get_input: vnf_id vson_clm_oam_net_ip: get_input: vson_clm_0_oam_net_ip_0 - port_vson_server_oam_net_port_0_mac_requirements: - mac_count_required: - is_required: false vson_dc_unit: get_input: vson_dc_unit oam_net_ips: @@ -1457,11 +1455,13 @@ topology_template: vfc_role: dbs swift_account_auth_token: get_input: swift_account_auth_token + port_vson_server_oam_net_port_00_mac_requirements: + mac_count_required: + is_required: false vson_server_group_id: get_input: vson_dbs_server_group_id vson_vm_flavor_name: get_input: vson_dbs_flavor_name - port_vson_server_oam_net_port_0_network_role_tag: oam availability_zones: - get_input: availability_zone_0 - get_input: availability_zone_1 @@ -1652,31 +1652,31 @@ topology_template: direction: ingress requirements: - port: - capability: attachment_vson_server_oam_net_port_0 + capability: attachment_vson_server_oam_net_port_20 node: vson_clm_0 relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_vson_server_oam_net_port_0 + capability: attachment_vson_server_oam_net_port_00 node: vson_dcl_group relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_vson_server_oam_net_port_0 + capability: attachment_vson_server_oam_net_port_00 node: vson_dbs_group relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_vson_server_oam_net_port_0 + capability: attachment_vson_server_oam_net_port_00 node: vson_dbg_group relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_vson_server_oam_net_port_0 + capability: attachment_vson_server_oam_net_port_20 node: vson_clm_group relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_vson_server_oam_net_port_0 + capability: attachment_vson_server_oam_net_port_10 node: vson_mdr_group relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_vson_server_oam_net_port_0 + capability: attachment_vson_server_oam_net_port_00 node: vson_cll_group relationship: org.openecomp.relationships.AttachesTo - port: @@ -1684,15 +1684,15 @@ topology_template: node: vson_app_group relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_vson_server_oam_net_port_0 + capability: attachment_vson_server_oam_net_port_00 node: vson_dbc_group relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_vson_server_oam_net_port_0 + capability: attachment_vson_server_oam_net_port_10 node: vson_mon_group relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_vson_server_oam_net_port_0 + capability: attachment_vson_server_oam_net_port_10 node: vson_mgt_group relationship: org.openecomp.relationships.AttachesTo vson_dbg_volume_0: @@ -1718,12 +1718,7 @@ topology_template: get_input: vf_module_id default_gateway: get_input: default_gateway - port_vson_server_oam_net_port_0_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + port_vson_server_oam_net_port_00_network_role_tag: oam instance_index: get_property: - SELF @@ -1733,6 +1728,12 @@ topology_template: get_input: vnf_name oam_net_subnet_prefix_length: get_input: oam_net_subnet_prefix_length + port_vson_server_oam_net_port_00_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false vf_module_name: get_input: vf_module_name dns_servers: @@ -1750,9 +1751,6 @@ topology_template: get_input: vnf_id vson_clm_oam_net_ip: get_input: vson_clm_0_oam_net_ip_0 - port_vson_server_oam_net_port_0_mac_requirements: - mac_count_required: - is_required: false vson_dc_unit: get_input: vson_dc_unit oam_net_ips: @@ -1760,11 +1758,13 @@ topology_template: vfc_role: dbg swift_account_auth_token: get_input: swift_account_auth_token + port_vson_server_oam_net_port_00_mac_requirements: + mac_count_required: + is_required: false vson_server_group_id: get_input: vson_dbg_server_group_id vson_vm_flavor_name: get_input: vson_dbg_flavor_name - port_vson_server_oam_net_port_0_network_role_tag: oam availability_zones: - get_input: availability_zone_0 volume_ids: @@ -1786,12 +1786,7 @@ topology_template: get_input: vf_module_id default_gateway: get_input: default_gateway - port_vson_server_oam_net_port_0_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + port_vson_server_oam_net_port_00_network_role_tag: oam instance_index: get_property: - SELF @@ -1801,6 +1796,12 @@ topology_template: get_input: vnf_name oam_net_subnet_prefix_length: get_input: oam_net_subnet_prefix_length + port_vson_server_oam_net_port_00_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false vf_module_name: get_input: vf_module_name dns_servers: @@ -1818,9 +1819,6 @@ topology_template: get_input: vnf_id vson_clm_oam_net_ip: get_input: vson_clm_0_oam_net_ip_0 - port_vson_server_oam_net_port_0_mac_requirements: - mac_count_required: - is_required: false vson_dc_unit: get_input: vson_dc_unit oam_net_ips: @@ -1830,11 +1828,13 @@ topology_template: vfc_role: cll swift_account_auth_token: get_input: swift_account_auth_token + port_vson_server_oam_net_port_00_mac_requirements: + mac_count_required: + is_required: false vson_server_group_id: get_input: vson_leader_server_group_id vson_vm_flavor_name: get_input: vson_cll_flavor_name - port_vson_server_oam_net_port_0_network_role_tag: oam availability_zones: - get_input: availability_zone_0 - get_input: availability_zone_1 @@ -1875,12 +1875,6 @@ topology_template: get_input: vf_module_id default_gateway: get_input: default_gateway - port_vson_server_oam_net_port_0_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false instance_index: get_property: - SELF @@ -1905,9 +1899,6 @@ topology_template: get_input: vnf_id vson_clm_oam_net_ip: get_input: vson_clm_0_oam_net_ip_0 - port_vson_server_oam_net_port_0_mac_requirements: - mac_count_required: - is_required: false vson_dc_unit: get_input: vson_dc_unit oam_net_ips: @@ -1919,17 +1910,26 @@ topology_template: get_input: vson_mon_server_group_id vson_vm_flavor_name: get_input: vson_mon_flavor_name - port_vson_server_oam_net_port_0_network_role_tag: oam availability_zones: - get_input: availability_zone_0 volume_ids: - get_input: vson_mon_volume_id_0 + port_vson_server_oam_net_port_10_network_role_tag: oam ntp_servers: get_input: ntp_servers oam_net_id: get_input: oam_net_id vson_vm_names: - get_input: vson_mon_name_0 + port_vson_server_oam_net_port_10_mac_requirements: + mac_count_required: + is_required: false + port_vson_server_oam_net_port_10_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false vson_dcl_group: type: org.openecomp.resource.abstract.nodes.heat.vson_vm_1 directives: @@ -1939,12 +1939,7 @@ topology_template: get_input: vf_module_id default_gateway: get_input: default_gateway - port_vson_server_oam_net_port_0_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + port_vson_server_oam_net_port_00_network_role_tag: oam instance_index: get_property: - SELF @@ -1954,6 +1949,12 @@ topology_template: get_input: vnf_name oam_net_subnet_prefix_length: get_input: oam_net_subnet_prefix_length + port_vson_server_oam_net_port_00_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false vf_module_name: get_input: vf_module_name dns_servers: @@ -1971,9 +1972,6 @@ topology_template: get_input: vnf_id vson_clm_oam_net_ip: get_input: vson_clm_0_oam_net_ip_0 - port_vson_server_oam_net_port_0_mac_requirements: - mac_count_required: - is_required: false vson_dc_unit: get_input: vson_dc_unit oam_net_ips: @@ -1983,11 +1981,13 @@ topology_template: vfc_role: dcl swift_account_auth_token: get_input: swift_account_auth_token + port_vson_server_oam_net_port_00_mac_requirements: + mac_count_required: + is_required: false vson_server_group_id: get_input: vson_leader_server_group_id vson_vm_flavor_name: get_input: vson_dcl_flavor_name - port_vson_server_oam_net_port_0_network_role_tag: oam availability_zones: - get_input: availability_zone_0 - get_input: availability_zone_1 @@ -2243,4 +2243,4 @@ topology_template: value: vson_dbs_volume_1 vson_mon_server_group_id: description: ID of the Server Group intended for vSON MON instances. - value: UNSUPPORTED_RESOURCE_vson_mon_server_group + value: UNSUPPORTED_RESOURCE_vson_mon_server_group
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml index 1a228242f5..fa4b53a50a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml @@ -29,11 +29,6 @@ topology_template: immutable: false type: string description: Default gateway. - port_vson_server_oam_net_port_0_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements instance_index: label: Instance Index hidden: false @@ -73,6 +68,11 @@ topology_template: description: List of DNS servers. entry_schema: type: string + port_vson_server_oam_net_port_20_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements oam_net_security_group_id: label: OAM network security group ID hidden: false @@ -92,7 +92,7 @@ topology_template: immutable: false type: string description: Unique ID for this VF instance. - port_vson_server_oam_net_port_0_network_role: + port_vson_server_oam_net_port_20_network_role_tag: type: string required: true vson_clm_oam_net_ip: @@ -101,12 +101,6 @@ topology_template: immutable: false type: string description: IP of the vSON Cluster Manager. - port_vson_server_oam_net_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_vson_server_oam_net_port_0_subnetpoolid: - type: string - required: true oam_net_ips: label: vSON OAM network IP addresses hidden: false @@ -147,14 +141,9 @@ topology_template: immutable: false type: string description: The ID or name of the flavor to boot onto. - port_vson_server_oam_net_port_0_network_role_tag: - type: string - required: true - port_vson_server_oam_net_port_0_vlan_requirements: - type: list + port_vson_server_oam_net_port_20_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements availability_zones: label: Availability zones hidden: false @@ -171,18 +160,29 @@ topology_template: description: List of NTP servers. entry_schema: type: string + port_vson_server_oam_net_port_20_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_vson_server_oam_net_port_20_network_role: + type: string + required: true + port_vson_server_oam_net_port_20_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vson_server_oam_net_port_20_subnetpoolid: + type: string + required: true oam_net_id: label: OAM network ID hidden: false immutable: false type: string description: The ID of the OAM network. - port_vson_server_oam_net_port_0_order: + port_vson_server_oam_net_port_20_order: type: integer required: true - port_vson_server_oam_net_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true vson_vm_names: label: vSON Cluster leader names hidden: false @@ -192,7 +192,7 @@ topology_template: entry_schema: type: string node_templates: - vson_server: + vson_server_1: type: org.openecomp.resource.vfc.compute.nodes.heat.vson_vm properties: flavor: @@ -223,24 +223,24 @@ topology_template: scheduler_hints: group: get_input: vson_server_group_id - vson_server_oam_net_port_0: + vson_server_oam_net_port_20: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: - get_input: port_vson_server_oam_net_port_0_ip_requirements + get_input: port_vson_server_oam_net_port_20_ip_requirements security_groups: - get_input: oam_net_security_group_id network_role: - get_input: port_vson_server_oam_net_port_0_network_role + get_input: port_vson_server_oam_net_port_20_network_role fixed_ips: - ip_address: get_input: - oam_net_ips - get_input: instance_index subnetpoolid: - get_input: port_vson_server_oam_net_port_0_subnetpoolid + get_input: port_vson_server_oam_net_port_20_subnetpoolid mac_requirements: - get_input: port_vson_server_oam_net_port_0_mac_requirements + get_input: port_vson_server_oam_net_port_20_mac_requirements name: str_replace: template: VNF_NAME_VNF_ID_SERVER_NAME_oam_net_port_0 @@ -254,19 +254,19 @@ topology_template: - vson_vm_names - get_input: instance_index exCP_naming: - get_input: port_vson_server_oam_net_port_0_exCP_naming + get_input: port_vson_server_oam_net_port_20_exCP_naming vlan_requirements: - get_input: port_vson_server_oam_net_port_0_vlan_requirements + get_input: port_vson_server_oam_net_port_20_vlan_requirements network_role_tag: - get_input: port_vson_server_oam_net_port_0_network_role_tag + get_input: port_vson_server_oam_net_port_20_network_role_tag network: get_input: oam_net_id order: - get_input: port_vson_server_oam_net_port_0_order + get_input: port_vson_server_oam_net_port_20_order requirements: - binding: capability: tosca.capabilities.network.Bindable - node: vson_server + node: vson_server_1 relationship: tosca.relationships.network.BindsTo groups: nested_vson_server_group: @@ -276,177 +276,177 @@ topology_template: description: | The template intended for deploying vSON VM instance. members: - - vson_server - - vson_server_oam_net_port_0 + - vson_server_1 + - vson_server_oam_net_port_20 substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.vson_vm_4 capabilities: - disk.write.bytes_vson_server: - - vson_server - - disk.write.bytes - disk.device.allocation_vson_server: - - vson_server - - disk.device.allocation - network.incoming.packets_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 - - network.incoming.packets - memory.usage_vson_server: - - vson_server - - memory.usage - network.incoming.bytes_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 - - network.incoming.bytes - disk.device.latency_vson_server: - - vson_server - - disk.device.latency - disk.device.write.bytes.rate_vson_server: - - vson_server - - disk.device.write.bytes.rate - disk.device.read.requests_vson_server: - - vson_server - - disk.device.read.requests - memory_vson_server: - - vson_server - - memory - disk.latency_vson_server: - - vson_server - - disk.latency - os_vson_server: - - vson_server - - os - feature_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 - - feature - instance_vson_server: - - vson_server + instance_vson_server_1: + - vson_server_1 - instance - cpu_vson_server: - - vson_server - - cpu - attachment_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 - - attachment - disk.iops_vson_server: - - vson_server - - disk.iops - network.outgoing.bytes_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 - - network.outgoing.bytes - disk.device.write.bytes_vson_server: - - vson_server + disk.device.write.bytes_vson_server_1: + - vson_server_1 - disk.device.write.bytes - disk.device.read.bytes.rate_vson_server: - - vson_server - - disk.device.read.bytes.rate - endpoint_vson_server: - - vson_server + disk.read.requests_vson_server_1: + - vson_server_1 + - disk.read.requests + disk.read.bytes_vson_server_1: + - vson_server_1 + - disk.read.bytes + disk.read.bytes.rate_vson_server_1: + - vson_server_1 + - disk.read.bytes.rate + disk.latency_vson_server_1: + - vson_server_1 + - disk.latency + endpoint_vson_server_1: + - vson_server_1 - endpoint - vcpus_vson_server: - - vson_server - - vcpus - network.incoming.packets.rate_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 - - network.incoming.packets.rate - disk.device.read.requests.rate_vson_server: - - vson_server + disk.write.requests_vson_server_1: + - vson_server_1 + - disk.write.requests + memory_vson_server_1: + - vson_server_1 + - memory + cpu_util_vson_server_1: + - vson_server_1 + - cpu_util + disk.device.read.requests.rate_vson_server_1: + - vson_server_1 - disk.device.read.requests.rate - disk.write.requests.rate_vson_server: - - vson_server - - disk.write.requests.rate - disk.capacity_vson_server: - - vson_server - - disk.capacity - disk.device.capacity_vson_server: - - vson_server - - disk.device.capacity - disk.device.iops_vson_server: - - vson_server + disk.device.iops_vson_server_1: + - vson_server_1 - disk.device.iops - disk.device.write.requests.rate_vson_server: - - vson_server - - disk.device.write.requests.rate - network.outpoing.packets_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 - - network.outpoing.packets - disk.read.bytes_vson_server: - - vson_server - - disk.read.bytes - disk.read.bytes.rate_vson_server: - - vson_server - - disk.read.bytes.rate - disk.device.write.requests_vson_server: - - vson_server - - disk.device.write.requests - network.outgoing.packets.rate_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 - - network.outgoing.packets.rate - disk.root.size_vson_server: - - vson_server - - disk.root.size - disk.ephemeral.size_vson_server: - - vson_server + disk.usage_vson_server_1: + - vson_server_1 + - disk.usage + disk.allocation_vson_server_1: + - vson_server_1 + - disk.allocation + disk.capacity_vson_server_1: + - vson_server_1 + - disk.capacity + memory.usage_vson_server_1: + - vson_server_1 + - memory.usage + disk.device.read.bytes.rate_vson_server_1: + - vson_server_1 + - disk.device.read.bytes.rate + disk.write.requests.rate_vson_server_1: + - vson_server_1 + - disk.write.requests.rate + disk.ephemeral.size_vson_server_1: + - vson_server_1 - disk.ephemeral.size - memory.resident_vson_server: - - vson_server - - memory.resident - disk.device.read.bytes_vson_server: - - vson_server + feature_vson_server_oam_net_port_20: + - vson_server_oam_net_port_20 + - feature + disk.device.read.bytes_vson_server_1: + - vson_server_1 - disk.device.read.bytes - scalable_vson_server: - - vson_server - - scalable - network.outgoing.bytes.rate_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 + os_vson_server_1: + - vson_server_1 + - os + feature_vson_server_1: + - vson_server_1 + - feature + network.outpoing.packets_vson_server_oam_net_port_20: + - vson_server_oam_net_port_20 + - network.outpoing.packets + network.outgoing.bytes.rate_vson_server_oam_net_port_20: + - vson_server_oam_net_port_20 - network.outgoing.bytes.rate - disk.write.requests_vson_server: - - vson_server - - disk.write.requests - disk.usage_vson_server: - - vson_server - - disk.usage - cpu_util_vson_server: - - vson_server - - cpu_util - disk.device.usage_vson_server: - - vson_server - - disk.device.usage - cpu.delta_vson_server: - - vson_server + disk.root.size_vson_server_1: + - vson_server_1 + - disk.root.size + network.outgoing.packets.rate_vson_server_oam_net_port_20: + - vson_server_oam_net_port_20 + - network.outgoing.packets.rate + disk.device.write.requests_vson_server_1: + - vson_server_1 + - disk.device.write.requests + disk.device.write.bytes.rate_vson_server_1: + - vson_server_1 + - disk.device.write.bytes.rate + host_vson_server_1: + - vson_server_1 + - host + disk.device.latency_vson_server_1: + - vson_server_1 + - disk.device.latency + cpu.delta_vson_server_1: + - vson_server_1 - cpu.delta - disk.write.bytes.rate_vson_server: - - vson_server - - disk.write.bytes.rate - feature_vson_server: - - vson_server - - feature - disk.allocation_vson_server: - - vson_server - - disk.allocation - binding_vson_server: - - vson_server + network.outgoing.bytes_vson_server_oam_net_port_20: + - vson_server_oam_net_port_20 + - network.outgoing.bytes + network.incoming.bytes.rate_vson_server_oam_net_port_20: + - vson_server_oam_net_port_20 + - network.incoming.bytes.rate + memory.resident_vson_server_1: + - vson_server_1 + - memory.resident + binding_vson_server_oam_net_port_20: + - vson_server_oam_net_port_20 - binding - host_vson_server: - - vson_server - - host - binding_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 + disk.write.bytes_vson_server_1: + - vson_server_1 + - disk.write.bytes + disk.device.usage_vson_server_1: + - vson_server_1 + - disk.device.usage + disk.device.write.requests.rate_vson_server_1: + - vson_server_1 + - disk.device.write.requests.rate + scalable_vson_server_1: + - vson_server_1 + - scalable + network.incoming.packets_vson_server_oam_net_port_20: + - vson_server_oam_net_port_20 + - network.incoming.packets + vcpus_vson_server_1: + - vson_server_1 + - vcpus + binding_vson_server_1: + - vson_server_1 - binding - network.incoming.bytes.rate_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 - - network.incoming.bytes.rate - disk.read.requests_vson_server: - - vson_server - - disk.read.requests + network.incoming.packets.rate_vson_server_oam_net_port_20: + - vson_server_oam_net_port_20 + - network.incoming.packets.rate + disk.iops_vson_server_1: + - vson_server_1 + - disk.iops + disk.write.bytes.rate_vson_server_1: + - vson_server_1 + - disk.write.bytes.rate + network.incoming.bytes_vson_server_oam_net_port_20: + - vson_server_oam_net_port_20 + - network.incoming.bytes + attachment_vson_server_oam_net_port_20: + - vson_server_oam_net_port_20 + - attachment + disk.device.allocation_vson_server_1: + - vson_server_1 + - disk.device.allocation + cpu_vson_server_1: + - vson_server_1 + - cpu + disk.device.read.requests_vson_server_1: + - vson_server_1 + - disk.device.read.requests + disk.device.capacity_vson_server_1: + - vson_server_1 + - disk.device.capacity requirements: - link_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 + local_storage_vson_server_1: + - vson_server_1 + - local_storage + link_vson_server_oam_net_port_20: + - vson_server_oam_net_port_20 - link - dependency_vson_server: - - vson_server - - dependency - dependency_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 + dependency_vson_server_oam_net_port_20: + - vson_server_oam_net_port_20 - dependency - local_storage_vson_server: - - vson_server - - local_storage + dependency_vson_server_1: + - vson_server_1 + - 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/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml index 12f38c972e..3ac286aba1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml @@ -23,11 +23,6 @@ topology_template: immutable: false type: string description: Default gateway. - port_vson_server_oam_net_port_0_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements instance_index: label: Instance Index hidden: false @@ -40,12 +35,20 @@ topology_template: immutable: false type: string description: Unique name for this VF instance. + port_vson_server_oam_net_port_10_network_role: + type: string + required: true oam_net_subnet_prefix_length: label: OAM net subnet prefix length hidden: false immutable: false type: string description: Prefix length of the subnet on the OAM network. + port_vson_server_oam_net_port_10_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vf_module_name: label: VF module name hidden: false @@ -73,19 +76,13 @@ topology_template: immutable: false type: string description: Unique ID for this VF instance. - port_vson_server_oam_net_port_0_network_role: - type: string - required: true vson_clm_oam_net_ip: label: vSON Cluster Manager IP hidden: false immutable: false type: string description: IP of the vSON Cluster Manager. - port_vson_server_oam_net_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_vson_server_oam_net_port_0_subnetpoolid: + port_vson_server_oam_net_port_10_subnetpoolid: type: string required: true vson_dc_unit: @@ -128,14 +125,6 @@ topology_template: immutable: false type: string description: The ID or name of the flavor to boot onto. - port_vson_server_oam_net_port_0_network_role_tag: - type: string - required: true - port_vson_server_oam_net_port_0_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements availability_zones: label: Availability zones hidden: false @@ -152,6 +141,9 @@ topology_template: description: List of Volumes IDs. entry_schema: type: string + port_vson_server_oam_net_port_10_network_role_tag: + type: string + required: true ntp_servers: label: NTP servers hidden: false @@ -160,18 +152,18 @@ topology_template: description: List of NTP servers. entry_schema: type: string + port_vson_server_oam_net_port_10_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true oam_net_id: label: OAM network ID hidden: false immutable: false type: string description: The ID of the OAM network. - port_vson_server_oam_net_port_0_order: + port_vson_server_oam_net_port_10_order: type: integer required: true - port_vson_server_oam_net_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true vson_vm_names: label: vSON Cluster leader names hidden: false @@ -180,8 +172,16 @@ topology_template: description: A list of unique names to be issued to the vSON Cluster leaders. entry_schema: type: string + port_vson_server_oam_net_port_10_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_vson_server_oam_net_port_10_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements node_templates: - vson_server: + vson_server_3: type: org.openecomp.resource.vfc.compute.nodes.heat.vson_vm properties: flavor: @@ -210,24 +210,24 @@ topology_template: scheduler_hints: group: get_input: vson_server_group_id - vson_server_oam_net_port_0: + vson_server_oam_net_port_10: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: - get_input: port_vson_server_oam_net_port_0_ip_requirements + get_input: port_vson_server_oam_net_port_10_ip_requirements security_groups: - get_input: oam_net_security_group_id network_role: - get_input: port_vson_server_oam_net_port_0_network_role + get_input: port_vson_server_oam_net_port_10_network_role fixed_ips: - ip_address: get_input: - oam_net_ips - get_input: instance_index subnetpoolid: - get_input: port_vson_server_oam_net_port_0_subnetpoolid + get_input: port_vson_server_oam_net_port_10_subnetpoolid mac_requirements: - get_input: port_vson_server_oam_net_port_0_mac_requirements + get_input: port_vson_server_oam_net_port_10_mac_requirements name: str_replace: template: VNF_NAME_VNF_ID_SERVER_NAME_oam_net_port_0 @@ -241,19 +241,19 @@ topology_template: - vson_vm_names - get_input: instance_index exCP_naming: - get_input: port_vson_server_oam_net_port_0_exCP_naming + get_input: port_vson_server_oam_net_port_10_exCP_naming vlan_requirements: - get_input: port_vson_server_oam_net_port_0_vlan_requirements + get_input: port_vson_server_oam_net_port_10_vlan_requirements network_role_tag: - get_input: port_vson_server_oam_net_port_0_network_role_tag + get_input: port_vson_server_oam_net_port_10_network_role_tag network: get_input: oam_net_id order: - get_input: port_vson_server_oam_net_port_0_order + get_input: port_vson_server_oam_net_port_10_order requirements: - binding: capability: tosca.capabilities.network.Bindable - node: vson_server + node: vson_server_3 relationship: tosca.relationships.network.BindsTo groups: nested_vson_server_from_vol_group: @@ -263,177 +263,177 @@ topology_template: description: | The template intended for deploying vSON VM instance that's supposed to be booted from a Cinder volume. members: - - vson_server - - vson_server_oam_net_port_0 + - vson_server_3 + - vson_server_oam_net_port_10 substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.vson_vm_2 capabilities: - disk.write.bytes_vson_server: - - vson_server - - disk.write.bytes - disk.device.allocation_vson_server: - - vson_server - - disk.device.allocation - network.incoming.packets_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 - - network.incoming.packets - memory.usage_vson_server: - - vson_server - - memory.usage - network.incoming.bytes_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 - - network.incoming.bytes - disk.device.latency_vson_server: - - vson_server - - disk.device.latency - disk.device.write.bytes.rate_vson_server: - - vson_server - - disk.device.write.bytes.rate - disk.device.read.requests_vson_server: - - vson_server - - disk.device.read.requests - memory_vson_server: - - vson_server - - memory - disk.latency_vson_server: - - vson_server - - disk.latency - os_vson_server: - - vson_server - - os - feature_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 - - feature - instance_vson_server: - - vson_server - - instance - cpu_vson_server: - - vson_server - - cpu - attachment_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 - - attachment - disk.iops_vson_server: - - vson_server - - disk.iops - network.outgoing.bytes_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 - - network.outgoing.bytes - disk.device.write.bytes_vson_server: - - vson_server - - disk.device.write.bytes - disk.device.read.bytes.rate_vson_server: - - vson_server - - disk.device.read.bytes.rate - endpoint_vson_server: - - vson_server + endpoint_vson_server_3: + - vson_server_3 - endpoint - vcpus_vson_server: - - vson_server - - vcpus - network.incoming.packets.rate_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 + disk.read.bytes_vson_server_3: + - vson_server_3 + - disk.read.bytes + disk.read.requests_vson_server_3: + - vson_server_3 + - disk.read.requests + network.incoming.packets.rate_vson_server_oam_net_port_10: + - vson_server_oam_net_port_10 - network.incoming.packets.rate - disk.device.read.requests.rate_vson_server: - - vson_server + binding_vson_server_3: + - vson_server_3 + - binding + disk.read.bytes.rate_vson_server_3: + - vson_server_3 + - disk.read.bytes.rate + disk.device.write.bytes_vson_server_3: + - vson_server_3 + - disk.device.write.bytes + instance_vson_server_3: + - vson_server_3 + - instance + disk.latency_vson_server_3: + - vson_server_3 + - disk.latency + cpu_util_vson_server_3: + - vson_server_3 + - cpu_util + feature_vson_server_oam_net_port_10: + - vson_server_oam_net_port_10 + - feature + disk.write.requests_vson_server_3: + - vson_server_3 + - disk.write.requests + memory_vson_server_3: + - vson_server_3 + - memory + network.outgoing.bytes.rate_vson_server_oam_net_port_10: + - vson_server_oam_net_port_10 + - network.outgoing.bytes.rate + disk.device.read.requests.rate_vson_server_3: + - vson_server_3 - disk.device.read.requests.rate - disk.write.requests.rate_vson_server: - - vson_server - - disk.write.requests.rate - disk.capacity_vson_server: - - vson_server - - disk.capacity - disk.device.capacity_vson_server: - - vson_server - - disk.device.capacity - disk.device.iops_vson_server: - - vson_server + disk.device.iops_vson_server_3: + - vson_server_3 - disk.device.iops - disk.device.write.requests.rate_vson_server: - - vson_server - - disk.device.write.requests.rate - network.outpoing.packets_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 - - network.outpoing.packets - disk.read.bytes_vson_server: - - vson_server - - disk.read.bytes - disk.read.bytes.rate_vson_server: - - vson_server - - disk.read.bytes.rate - disk.device.write.requests_vson_server: - - vson_server - - disk.device.write.requests - network.outgoing.packets.rate_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 + disk.capacity_vson_server_3: + - vson_server_3 + - disk.capacity + memory.usage_vson_server_3: + - vson_server_3 + - memory.usage + disk.usage_vson_server_3: + - vson_server_3 + - disk.usage + disk.device.read.bytes.rate_vson_server_3: + - vson_server_3 + - disk.device.read.bytes.rate + network.outgoing.packets.rate_vson_server_oam_net_port_10: + - vson_server_oam_net_port_10 - network.outgoing.packets.rate - disk.root.size_vson_server: - - vson_server - - disk.root.size - disk.ephemeral.size_vson_server: - - vson_server + disk.allocation_vson_server_3: + - vson_server_3 + - disk.allocation + disk.write.requests.rate_vson_server_3: + - vson_server_3 + - disk.write.requests.rate + disk.ephemeral.size_vson_server_3: + - vson_server_3 - disk.ephemeral.size - memory.resident_vson_server: - - vson_server - - memory.resident - disk.device.read.bytes_vson_server: - - vson_server + network.incoming.bytes.rate_vson_server_oam_net_port_10: + - vson_server_oam_net_port_10 + - network.incoming.bytes.rate + disk.device.read.bytes_vson_server_3: + - vson_server_3 - disk.device.read.bytes - scalable_vson_server: - - vson_server - - scalable - network.outgoing.bytes.rate_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 - - network.outgoing.bytes.rate - disk.write.requests_vson_server: - - vson_server - - disk.write.requests - disk.usage_vson_server: - - vson_server - - disk.usage - cpu_util_vson_server: - - vson_server - - cpu_util - disk.device.usage_vson_server: - - vson_server - - disk.device.usage - cpu.delta_vson_server: - - vson_server - - cpu.delta - disk.write.bytes.rate_vson_server: - - vson_server - - disk.write.bytes.rate - feature_vson_server: - - vson_server - - feature - disk.allocation_vson_server: - - vson_server - - disk.allocation - binding_vson_server: - - vson_server + binding_vson_server_oam_net_port_10: + - vson_server_oam_net_port_10 - binding - host_vson_server: - - vson_server + os_vson_server_3: + - vson_server_3 + - os + disk.root.size_vson_server_3: + - vson_server_3 + - disk.root.size + disk.device.write.bytes.rate_vson_server_3: + - vson_server_3 + - disk.device.write.bytes.rate + disk.device.write.requests_vson_server_3: + - vson_server_3 + - disk.device.write.requests + network.incoming.packets_vson_server_oam_net_port_10: + - vson_server_oam_net_port_10 + - network.incoming.packets + host_vson_server_3: + - vson_server_3 - host - binding_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 - - binding - network.incoming.bytes.rate_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 - - network.incoming.bytes.rate - disk.read.requests_vson_server: - - vson_server - - disk.read.requests + disk.device.latency_vson_server_3: + - vson_server_3 + - disk.device.latency + cpu.delta_vson_server_3: + - vson_server_3 + - cpu.delta + memory.resident_vson_server_3: + - vson_server_3 + - memory.resident + attachment_vson_server_oam_net_port_10: + - vson_server_oam_net_port_10 + - attachment + network.incoming.bytes_vson_server_oam_net_port_10: + - vson_server_oam_net_port_10 + - network.incoming.bytes + feature_vson_server_3: + - vson_server_3 + - feature + disk.write.bytes_vson_server_3: + - vson_server_3 + - disk.write.bytes + disk.device.read.requests_vson_server_3: + - vson_server_3 + - disk.device.read.requests + network.outpoing.packets_vson_server_oam_net_port_10: + - vson_server_oam_net_port_10 + - network.outpoing.packets + disk.device.usage_vson_server_3: + - vson_server_3 + - disk.device.usage + disk.device.write.requests.rate_vson_server_3: + - vson_server_3 + - disk.device.write.requests.rate + vcpus_vson_server_3: + - vson_server_3 + - vcpus + disk.write.bytes.rate_vson_server_3: + - vson_server_3 + - disk.write.bytes.rate + disk.iops_vson_server_3: + - vson_server_3 + - disk.iops + scalable_vson_server_3: + - vson_server_3 + - scalable + disk.device.capacity_vson_server_3: + - vson_server_3 + - disk.device.capacity + disk.device.allocation_vson_server_3: + - vson_server_3 + - disk.device.allocation + cpu_vson_server_3: + - vson_server_3 + - cpu + network.outgoing.bytes_vson_server_oam_net_port_10: + - vson_server_oam_net_port_10 + - network.outgoing.bytes requirements: - link_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 - - link - dependency_vson_server: - - vson_server - - dependency - dependency_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 - - dependency - local_storage_vson_server: - - vson_server + local_storage_vson_server_3: + - vson_server_3 - local_storage + dependency_vson_server_oam_net_port_10: + - vson_server_oam_net_port_10 + - dependency + link_vson_server_oam_net_port_10: + - vson_server_oam_net_port_10 + - link + dependency_vson_server_3: + - vson_server_3 + - 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/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml index 8be5401b03..8292248260 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml @@ -23,11 +23,9 @@ topology_template: immutable: false type: string description: Default gateway. - port_vson_server_oam_net_port_0_ip_requirements: - type: list + port_vson_server_oam_net_port_00_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements instance_index: label: Instance Index hidden: false @@ -46,6 +44,11 @@ topology_template: immutable: false type: string description: Prefix length of the subnet on the OAM network. + port_vson_server_oam_net_port_00_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vf_module_name: label: VF module name hidden: false @@ -79,21 +82,12 @@ topology_template: immutable: false type: string description: Unique ID for this VF instance. - port_vson_server_oam_net_port_0_network_role: - type: string - required: true vson_clm_oam_net_ip: label: vSON Cluster Manager IP hidden: false immutable: false type: string description: IP of the vSON Cluster Manager. - port_vson_server_oam_net_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_vson_server_oam_net_port_0_subnetpoolid: - type: string - required: true vson_dc_unit: label: vSON Data Center name hidden: false @@ -121,6 +115,9 @@ topology_template: type: string description: | Swift account auth token. Example: 041a5187bb4641f9b89583e2539776b0 + port_vson_server_oam_net_port_00_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true vson_server_group_id: label: vSON server group ID hidden: false @@ -134,14 +131,6 @@ topology_template: immutable: false type: string description: The ID or name of the flavor to boot onto. - port_vson_server_oam_net_port_0_network_role_tag: - type: string - required: true - port_vson_server_oam_net_port_0_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements availability_zones: label: Availability zones hidden: false @@ -173,17 +162,25 @@ topology_template: type: string description: "Authentication Token generated for the user permitted to add \ \ a new Datacenter/vSON member to existing vSON Cluster. \n" + port_vson_server_oam_net_port_00_order: + type: integer + required: true + port_vson_server_oam_net_port_00_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true oam_net_id: label: OAM network ID hidden: false immutable: false type: string description: The ID of the OAM network. - port_vson_server_oam_net_port_0_order: - type: integer + port_vson_server_oam_net_port_00_vlan_requirements: + type: list required: true - port_vson_server_oam_net_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_vson_server_oam_net_port_00_network_role: + type: string required: true vson_vm_names: label: vSON Cluster leader names @@ -193,8 +190,11 @@ topology_template: description: A list of unique names to be issued to the vSON Cluster leaders. entry_schema: type: string + port_vson_server_oam_net_port_00_subnetpoolid: + type: string + required: true node_templates: - vson_server: + vson_server_2: type: org.openecomp.resource.vfc.compute.nodes.heat.vson_vm properties: flavor: @@ -225,24 +225,24 @@ topology_template: scheduler_hints: group: get_input: vson_server_group_id - vson_server_oam_net_port_0: + vson_server_oam_net_port_00: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: - get_input: port_vson_server_oam_net_port_0_ip_requirements + get_input: port_vson_server_oam_net_port_00_ip_requirements security_groups: - get_input: oam_net_security_group_id network_role: - get_input: port_vson_server_oam_net_port_0_network_role + get_input: port_vson_server_oam_net_port_00_network_role fixed_ips: - ip_address: get_input: - oam_net_ips - get_input: instance_index subnetpoolid: - get_input: port_vson_server_oam_net_port_0_subnetpoolid + get_input: port_vson_server_oam_net_port_00_subnetpoolid mac_requirements: - get_input: port_vson_server_oam_net_port_0_mac_requirements + get_input: port_vson_server_oam_net_port_00_mac_requirements name: str_replace: template: VNF_NAME_VNF_ID_SERVER_NAME_oam_net_port_0 @@ -256,19 +256,19 @@ topology_template: - vson_vm_names - get_input: instance_index exCP_naming: - get_input: port_vson_server_oam_net_port_0_exCP_naming + get_input: port_vson_server_oam_net_port_00_exCP_naming vlan_requirements: - get_input: port_vson_server_oam_net_port_0_vlan_requirements + get_input: port_vson_server_oam_net_port_00_vlan_requirements network_role_tag: - get_input: port_vson_server_oam_net_port_0_network_role_tag + get_input: port_vson_server_oam_net_port_00_network_role_tag network: get_input: oam_net_id order: - get_input: port_vson_server_oam_net_port_0_order + get_input: port_vson_server_oam_net_port_00_order requirements: - binding: capability: tosca.capabilities.network.Bindable - node: vson_server + node: vson_server_2 relationship: tosca.relationships.network.BindsTo groups: nested_vson_server_with_vol_group: @@ -278,177 +278,177 @@ topology_template: description: | The template intended for deploying vSON VM instance. members: - - vson_server - - vson_server_oam_net_port_0 + - vson_server_2 + - vson_server_oam_net_port_00 substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.vson_vm_1 capabilities: - disk.write.bytes_vson_server: - - vson_server - - disk.write.bytes - disk.device.allocation_vson_server: - - vson_server - - disk.device.allocation - network.incoming.packets_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 - - network.incoming.packets - memory.usage_vson_server: - - vson_server - - memory.usage - network.incoming.bytes_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 - - network.incoming.bytes - disk.device.latency_vson_server: - - vson_server - - disk.device.latency - disk.device.write.bytes.rate_vson_server: - - vson_server - - disk.device.write.bytes.rate - disk.device.read.requests_vson_server: - - vson_server - - disk.device.read.requests - memory_vson_server: - - vson_server - - memory - disk.latency_vson_server: - - vson_server - - disk.latency - os_vson_server: - - vson_server - - os - feature_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 - - feature - instance_vson_server: - - vson_server + network.outpoing.packets_vson_server_oam_net_port_00: + - vson_server_oam_net_port_00 + - network.outpoing.packets + network.outgoing.bytes.rate_vson_server_oam_net_port_00: + - vson_server_oam_net_port_00 + - network.outgoing.bytes.rate + instance_vson_server_2: + - vson_server_2 - instance - cpu_vson_server: - - vson_server - - cpu - attachment_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 - - attachment - disk.iops_vson_server: - - vson_server - - disk.iops - network.outgoing.bytes_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 - - network.outgoing.bytes - disk.device.write.bytes_vson_server: - - vson_server + disk.device.write.bytes_vson_server_2: + - vson_server_2 - disk.device.write.bytes - disk.device.read.bytes.rate_vson_server: - - vson_server - - disk.device.read.bytes.rate - endpoint_vson_server: - - vson_server + disk.read.requests_vson_server_2: + - vson_server_2 + - disk.read.requests + disk.read.bytes_vson_server_2: + - vson_server_2 + - disk.read.bytes + network.outgoing.packets.rate_vson_server_oam_net_port_00: + - vson_server_oam_net_port_00 + - network.outgoing.packets.rate + disk.latency_vson_server_2: + - vson_server_2 + - disk.latency + disk.read.bytes.rate_vson_server_2: + - vson_server_2 + - disk.read.bytes.rate + endpoint_vson_server_2: + - vson_server_2 - endpoint - vcpus_vson_server: - - vson_server - - vcpus - network.incoming.packets.rate_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 - - network.incoming.packets.rate - disk.device.read.requests.rate_vson_server: - - vson_server + network.incoming.bytes.rate_vson_server_oam_net_port_00: + - vson_server_oam_net_port_00 + - network.incoming.bytes.rate + disk.write.requests_vson_server_2: + - vson_server_2 + - disk.write.requests + binding_vson_server_oam_net_port_00: + - vson_server_oam_net_port_00 + - binding + memory_vson_server_2: + - vson_server_2 + - memory + network.outgoing.bytes_vson_server_oam_net_port_00: + - vson_server_oam_net_port_00 + - network.outgoing.bytes + cpu_util_vson_server_2: + - vson_server_2 + - cpu_util + disk.device.read.requests.rate_vson_server_2: + - vson_server_2 - disk.device.read.requests.rate - disk.write.requests.rate_vson_server: - - vson_server - - disk.write.requests.rate - disk.capacity_vson_server: - - vson_server - - disk.capacity - disk.device.capacity_vson_server: - - vson_server - - disk.device.capacity - disk.device.iops_vson_server: - - vson_server + disk.device.iops_vson_server_2: + - vson_server_2 - disk.device.iops - disk.device.write.requests.rate_vson_server: - - vson_server - - disk.device.write.requests.rate - network.outpoing.packets_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 - - network.outpoing.packets - disk.read.bytes_vson_server: - - vson_server - - disk.read.bytes - disk.read.bytes.rate_vson_server: - - vson_server - - disk.read.bytes.rate - disk.device.write.requests_vson_server: - - vson_server - - disk.device.write.requests - network.outgoing.packets.rate_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 - - network.outgoing.packets.rate - disk.root.size_vson_server: - - vson_server - - disk.root.size - disk.ephemeral.size_vson_server: - - vson_server + disk.allocation_vson_server_2: + - vson_server_2 + - disk.allocation + memory.usage_vson_server_2: + - vson_server_2 + - memory.usage + disk.usage_vson_server_2: + - vson_server_2 + - disk.usage + network.incoming.packets_vson_server_oam_net_port_00: + - vson_server_oam_net_port_00 + - network.incoming.packets + disk.capacity_vson_server_2: + - vson_server_2 + - disk.capacity + disk.device.read.bytes.rate_vson_server_2: + - vson_server_2 + - disk.device.read.bytes.rate + network.incoming.packets.rate_vson_server_oam_net_port_00: + - vson_server_oam_net_port_00 + - network.incoming.packets.rate + network.incoming.bytes_vson_server_oam_net_port_00: + - vson_server_oam_net_port_00 + - network.incoming.bytes + disk.write.requests.rate_vson_server_2: + - vson_server_2 + - disk.write.requests.rate + attachment_vson_server_oam_net_port_00: + - vson_server_oam_net_port_00 + - attachment + disk.ephemeral.size_vson_server_2: + - vson_server_2 - disk.ephemeral.size - memory.resident_vson_server: - - vson_server - - memory.resident - disk.device.read.bytes_vson_server: - - vson_server + disk.device.read.bytes_vson_server_2: + - vson_server_2 - disk.device.read.bytes - scalable_vson_server: - - vson_server - - scalable - network.outgoing.bytes.rate_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 - - network.outgoing.bytes.rate - disk.write.requests_vson_server: - - vson_server - - disk.write.requests - disk.usage_vson_server: - - vson_server - - disk.usage - cpu_util_vson_server: - - vson_server - - cpu_util - disk.device.usage_vson_server: - - vson_server - - disk.device.usage - cpu.delta_vson_server: - - vson_server + os_vson_server_2: + - vson_server_2 + - os + disk.root.size_vson_server_2: + - vson_server_2 + - disk.root.size + disk.device.write.requests_vson_server_2: + - vson_server_2 + - disk.device.write.requests + host_vson_server_2: + - vson_server_2 + - host + disk.device.write.bytes.rate_vson_server_2: + - vson_server_2 + - disk.device.write.bytes.rate + cpu.delta_vson_server_2: + - vson_server_2 - cpu.delta - disk.write.bytes.rate_vson_server: - - vson_server - - disk.write.bytes.rate - feature_vson_server: - - vson_server + disk.device.latency_vson_server_2: + - vson_server_2 + - disk.device.latency + feature_vson_server_2: + - vson_server_2 - feature - disk.allocation_vson_server: - - vson_server - - disk.allocation - binding_vson_server: - - vson_server - - binding - host_vson_server: - - vson_server - - host - binding_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 + memory.resident_vson_server_2: + - vson_server_2 + - memory.resident + disk.write.bytes_vson_server_2: + - vson_server_2 + - disk.write.bytes + disk.device.usage_vson_server_2: + - vson_server_2 + - disk.device.usage + disk.device.write.requests.rate_vson_server_2: + - vson_server_2 + - disk.device.write.requests.rate + scalable_vson_server_2: + - vson_server_2 + - scalable + vcpus_vson_server_2: + - vson_server_2 + - vcpus + binding_vson_server_2: + - vson_server_2 - binding - network.incoming.bytes.rate_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 - - network.incoming.bytes.rate - disk.read.requests_vson_server: - - vson_server - - disk.read.requests + disk.write.bytes.rate_vson_server_2: + - vson_server_2 + - disk.write.bytes.rate + disk.iops_vson_server_2: + - vson_server_2 + - disk.iops + cpu_vson_server_2: + - vson_server_2 + - cpu + feature_vson_server_oam_net_port_00: + - vson_server_oam_net_port_00 + - feature + disk.device.allocation_vson_server_2: + - vson_server_2 + - disk.device.allocation + disk.device.read.requests_vson_server_2: + - vson_server_2 + - disk.device.read.requests + disk.device.capacity_vson_server_2: + - vson_server_2 + - disk.device.capacity requirements: - link_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 - - link - dependency_vson_server: - - vson_server - - dependency - dependency_vson_server_oam_net_port_0: - - vson_server_oam_net_port_0 - - dependency - local_storage_vson_server: - - vson_server + local_storage_vson_server_2: + - vson_server_2 - local_storage + dependency_vson_server_oam_net_port_00: + - vson_server_oam_net_port_00 + - dependency + link_vson_server_oam_net_port_00: + - vson_server_oam_net_port_00 + - link + dependency_vson_server_2: + - vson_server_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/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/in/nested1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/in/nested1.yml index c73fcf63d7..d59f16ed06 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/in/nested1.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/in/nested1.yml @@ -47,7 +47,7 @@ resources: security_groups: [{get_param: p2}] 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/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/in/nested2.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/in/nested2.yml index b4655fa35d..dca4585db3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/in/nested2.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/in/nested2.yml @@ -47,7 +47,7 @@ resources: security_groups: [{get_param: p1}] 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/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/in/nested3.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/in/nested3.yml index 55538833a4..157b085924 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/in/nested3.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/in/nested3.yml @@ -48,7 +48,7 @@ resources: security_groups: [{get_param: p2}] replacement_policy: AUTO - server_cmaui: + server_cmaui_3: 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/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/in/nested4.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/in/nested4.yml index ce3ffb76a8..0e689efa6a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/in/nested4.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/in/nested4.yml @@ -46,7 +46,7 @@ resources: security_groups: [{get_param: p2},{get_param: p2}] replacement_policy: AUTO - server_cmaui: + server_cmaui_4: 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/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml index 535f2ea84e..21183acb74 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -419,47 +419,58 @@ node_types: occurrences: - 1 - 1 - - dependency_cmaui_port_8: + - dependency_server_cmaui_4: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cmaui_port_8: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + - local_storage_server_cmaui_4: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 - - 1 - - dependency_server_cmaui: + - 0 + - UNBOUNDED + - dependency_cmaui_port_8: 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_8: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED + - 1 + - 1 capabilities: - cpu.delta_server_cmaui: + disk.write.bytes_server_cmaui_4: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_server_cmaui_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_server_cmaui: + feature_server_cmaui_4: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.latency_server_cmaui_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.allocation_server_cmaui: + disk.device.usage_server_cmaui_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -475,61 +486,59 @@ node_types: occurrences: - 1 - UNBOUNDED - scalable_server_cmaui: - type: tosca.capabilities.Scalable + disk.read.requests_server_cmaui_4: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_server_cmaui: + disk.allocation_server_cmaui_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_server_cmaui: + network.outgoing.packets.rate_cmaui_port_8: type: org.openecomp.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_7: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_server_cmaui: + vcpus_server_cmaui_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - host_server_cmaui: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + binding_server_cmaui_4: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - cpu_util_server_cmaui: + disk.root.size_server_cmaui_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_8: + disk.device.write.requests.rate_server_cmaui_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_7: + attachment_cmaui_port_8: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_8: - type: tosca.capabilities.Attachment + scalable_server_cmaui_4: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED @@ -539,121 +548,110 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.latency_server_cmaui: + disk.write.requests_server_cmaui_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests_server_cmaui: + disk.usage_server_cmaui_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.requests_server_cmaui: + disk.device.capacity_server_cmaui_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_server_cmaui: + disk.device.iops_server_cmaui_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.usage_server_cmaui: + disk.device.read.bytes.rate_server_cmaui_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.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. + endpoint_server_cmaui_4: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.capacity_server_cmaui: + disk.read.bytes_server_cmaui_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_server_cmaui: + network.incoming.packets.rate_cmaui_port_7: type: org.openecomp.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: - 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_4: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - instance_server_cmaui: + network.incoming.packets.rate_cmaui_port_8: type: org.openecomp.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.allocation_server_cmaui_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_7: + disk.write.requests.rate_server_cmaui_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory_server_cmaui: + disk.device.read.bytes_server_cmaui_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_8: + memory_server_cmaui_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.root.size_server_cmaui: + disk.write.bytes.rate_server_cmaui_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_server_cmaui: - type: tosca.capabilities.network.Bindable - occurrences: - - 1 - - UNBOUNDED - disk.device.read.requests.rate_server_cmaui: + cpu_server_cmaui_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes_server_cmaui: + disk.capacity_server_cmaui_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - os_server_cmaui: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - disk.device.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. + host_server_cmaui_4: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED @@ -675,13 +673,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_port_8: + instance_server_cmaui_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.resident_server_cmaui: + network.incoming.bytes.rate_cmaui_port_8: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -693,24 +691,13 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.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. - occurrences: - - 1 - - UNBOUNDED - feature_server_cmaui: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED network.outpoing.packets_cmaui_port_7: type: org.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.read.bytes.rate_server_cmaui_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -722,7 +709,7 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_server_cmaui: + disk.device.write.requests_server_cmaui_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -741,6 +728,12 @@ node_types: occurrences: - 1 - UNBOUNDED + disk.device.read.requests_server_cmaui_4: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED binding_cmaui_port_8: type: tosca.capabilities.network.Bindable valid_source_types: @@ -748,44 +741,45 @@ node_types: occurrences: - 0 - UNBOUNDED - disk.allocation_server_cmaui: + disk.iops_server_cmaui_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests_server_cmaui: + disk.device.read.requests.rate_server_cmaui_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.usage_server_cmaui: + cpu.delta_server_cmaui_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_server_cmaui: + memory.resident_server_cmaui_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_7: + disk.ephemeral.size_server_cmaui_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cmaui_port_8: + network.outgoing.bytes.rate_cmaui_port_7: type: org.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 + network.incoming.bytes_cmaui_port_8: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -795,7 +789,7 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.iops_server_cmaui: + disk.latency_server_cmaui_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -807,13 +801,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.iops_server_cmaui: + disk.device.write.bytes.rate_server_cmaui_4: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.usage_server_cmaui_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes_server_cmaui: + cpu_util_server_cmaui_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2013,14 +2013,14 @@ node_types: occurrences: - 1 - 1 - - dependency_server_cmaui: + - dependency_server_cmaui_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_server_cmaui: + - local_storage_server_cmaui_1: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage relationship: tosca.relationships.AttachesTo @@ -2047,6 +2047,20 @@ node_types: occurrences: - 1 - 1 + - dependency_server_cmaui_2_test_nested2Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - local_storage_server_cmaui_2_test_nested2Level: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED - dependency_cmaui_port_4_test_nested2Level: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -2087,6 +2101,20 @@ node_types: occurrences: - 1 - 1 + - dependency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - local_storage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED - dependency_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -2100,14 +2128,14 @@ node_types: occurrences: - 1 - 1 - - dependency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + - dependency_server_cmaui_3_test_nested3Level_test_nested2Level: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + - local_storage_server_cmaui_3_test_nested3Level_test_nested2Level: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage relationship: tosca.relationships.AttachesTo @@ -2140,34 +2168,6 @@ node_types: occurrences: - 1 - 1 - - dependency_server_cmaui_test_nested3Level_test_nested2Level: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - local_storage_server_cmaui_test_nested3Level_test_nested2Level: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: - - 0 - - UNBOUNDED - - dependency_server_cmaui_test_nested2Level: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - local_storage_server_cmaui_test_nested2Level: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: - - 0 - - UNBOUNDED - dependency_cmaui_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -2182,24 +2182,7 @@ node_types: - 1 - 1 capabilities: - os_server_cmaui_test_nested2Level: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - disk.device.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. - 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.allocation_server_cmaui_test_nested3Level_test_nested2Level: + memory.resident_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2218,39 +2201,38 @@ node_types: occurrences: - 0 - UNBOUNDED - disk.ephemeral.size_server_cmaui_test_nested3Level_test_nested2Level: + memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.usage_server_cmaui_test_nested3Level_test_nested2Level: + 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 - host_server_cmaui: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + disk.device.latency_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + 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 - feature_server_cmaui_test_nested2Level: - type: tosca.capabilities.Node + scalable_server_cmaui_3_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED @@ -2260,8 +2242,9 @@ node_types: occurrences: - 1 - UNBOUNDED - endpoint_server_cmaui_test_nested3Level_test_nested2Level: - type: tosca.capabilities.Endpoint.Admin + 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 @@ -2278,73 +2261,89 @@ node_types: occurrences: - 0 - UNBOUNDED - disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + endpoint_server_cmaui_2_test_nested2Level: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + binding_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + disk.latency_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - instance_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + network.incoming.packets_cmaui_port_3_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_3_test_nested2Level: + binding_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.device.read.bytes.rate_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_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + feature_server_cmaui_2_test_nested2Level: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.root.size_server_cmaui_test_nested2Level: + 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 - disk.write.requests_server_cmaui_test_nested3Level_test_nested2Level: + disk.capacity_server_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - disk.root.size_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + 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 - disk.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + disk.device.write.requests_server_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - instance_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 - cpu.delta_server_cmaui_test_nested3Level_test_nested2Level: + network.incoming.packets.rate_cmaui_port_6_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_6_test_nested3Level_test_nested2Level: + disk.device.read.bytes_server_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2362,7 +2361,19 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu_server_cmaui_test_nested2Level: + cpu_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests.rate_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2385,12 +2396,7 @@ node_types: occurrences: - 1 - UNBOUNDED - os_server_cmaui: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - memory.resident_server_cmaui_test_nested3Level_test_nested2Level: + disk.read.bytes_server_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2403,52 +2409,37 @@ node_types: occurrences: - 0 - UNBOUNDED - os_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - disk.device.read.requests.rate_server_cmaui_test_nested3Level_test_nested2Level: + network.incoming.bytes.rate_cmaui_port_4_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_port_4_test_nested2Level: + network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes_server_cmaui_test_nested2Level: + disk.device.allocation_server_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - scalable_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: - type: tosca.capabilities.Scalable - occurrences: - - 1 - - UNBOUNDED - instance_server_cmaui_test_nested2Level: + 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 - network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level: + disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - endpoint_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED - disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2466,35 +2457,24 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - disk.read.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level: + disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.capacity_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.latency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + instance_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_server_cmaui: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED binding_cmaui_port_1: type: tosca.capabilities.network.Bindable valid_source_types: @@ -2509,58 +2489,48 @@ node_types: occurrences: - 0 - UNBOUNDED - binding_server_cmaui_test_nested3Level_test_nested2Level: - type: tosca.capabilities.network.Bindable - occurrences: - - 1 - - UNBOUNDED feature_test_nested2Level: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - memory.usage_server_cmaui: + disk.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.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: - 1 - UNBOUNDED - os_server_cmaui_test_nested3Level_test_nested2Level: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level: + cpu_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_util_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes_server_cmaui_test_nested3Level_test_nested2Level: + network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + 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 - disk.device.iops_server_cmaui: + 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: @@ -2578,49 +2548,49 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.iops_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + 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: + network.incoming.bytes_cmaui_port_5_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cmaui_port_5_test_nested3Level_test_nested2Level: + 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 - network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level: + 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 - disk.device.read.requests_server_cmaui_test_nested2Level: + disk.device.read.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_1: + network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_2: + 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. occurrences: - 1 - UNBOUNDED - cpu_server_cmaui: + network.incoming.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: @@ -2642,274 +2612,252 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_server_cmaui: + cpu_server_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_server_cmaui_test_nested2Level: + disk.ephemeral.size_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.latency_server_cmaui_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_server_cmaui_1: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - disk.device.latency_server_cmaui: + disk.root.size_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.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. + os_server_cmaui_3_test_nested3Level_test_nested2Level: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - disk.usage_server_cmaui: + disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.usage_server_cmaui: + cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.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 - disk.write.requests.rate_server_cmaui: + disk.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: + memory_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_server_cmaui_test_nested2Level: + disk.device.write.bytes_server_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level: + network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests_server_cmaui: + network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.iops_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + endpoint_server_cmaui_1: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.device.iops_server_cmaui_test_nested3Level_test_nested2Level: + network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + os_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_server_cmaui_test_nested2Level: + disk.usage_server_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_server_cmaui: - type: tosca.capabilities.network.Bindable - occurrences: - - 1 - - UNBOUNDED network.outgoing.packets.rate_cmaui_port_4_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_server_cmaui: + disk.device.read.requests.rate_server_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - vcpus_server_cmaui_test_nested3Level_test_nested2Level: + disk.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level: + disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: + 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.device.capacity_server_cmaui_test_nested3Level_test_nested2Level: + network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes_server_cmaui: + network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - endpoint_server_cmaui_test_nested2Level: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: + 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.write.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level: + disk.device.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + disk.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cmaui_port_5_test_nested3Level_test_nested2Level: + network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_server_cmaui_test_nested3Level_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + os_server_cmaui_2_test_nested2Level: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_server_cmaui_test_nested2Level: + network.outgoing.bytes_cmaui_port_5_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cmaui_port_4_test_nested2Level: + disk.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_cmaui_port_3_test_nested2Level: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outpoing.packets_cmaui_port_5_test_nested3Level_test_nested2Level: + vcpus_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.root.size_server_cmaui_test_nested3Level_test_nested2Level: + 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 - memory.usage_server_cmaui_test_nested3Level_test_nested2Level: + disk.device.iops_server_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_3_test_nested2Level: - type: tosca.capabilities.Attachment + network.incoming.bytes_cmaui_port_4_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: - type: tosca.capabilities.network.Bindable + feature_cmaui_port_3_test_nested2Level: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - vcpus_server_cmaui: + disk.read.bytes.rate_server_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_server_cmaui: + network.outpoing.packets_cmaui_port_5_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes_server_cmaui_test_nested3Level_test_nested2Level: + 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 - instance_server_cmaui_test_nested3Level_test_nested2Level: + instance_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory_server_cmaui_test_nested2Level: + memory_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.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. + attachment_cmaui_port_3_test_nested2Level: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + endpoint_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED @@ -2925,59 +2873,42 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - disk.ephemeral.size_server_cmaui_test_nested2Level: + 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 - disk.device.read.bytes_server_cmaui_test_nested3Level_test_nested2Level: + 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 - disk.device.allocation_server_cmaui_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.iops_server_cmaui_test_nested2Level: + disk.device.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_server_cmaui_test_nested2Level: - type: tosca.capabilities.network.Bindable - occurrences: - - 1 - - UNBOUNDED network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - memory.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + disk.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu.delta_server_cmaui: + disk.device.allocation_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2988,7 +2919,7 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.capacity_server_cmaui_test_nested2Level: + cpu_util_server_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2999,47 +2930,42 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_server_cmaui_test_nested2Level: + memory.usage_server_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - scalable_server_cmaui: - type: tosca.capabilities.Scalable - occurrences: - - 1 - - UNBOUNDED - disk.read.bytes.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 - disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - scalable_server_cmaui_test_nested3Level_test_nested2Level: - type: tosca.capabilities.Scalable + feature_server_cmaui_3_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.read.bytes_server_cmaui_test_nested2Level: + disk.device.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.latency_server_cmaui_test_nested3Level_test_nested2Level: + disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu.delta_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + disk.device.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3051,127 +2977,120 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.usage_server_cmaui_test_nested3Level_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - cpu_util_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.device.write.requests_server_cmaui: + disk.read.requests_server_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_server_cmaui_test_nested3Level_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.capacity_server_cmaui_test_nested2Level: + disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_server_cmaui_test_nested2Level: + disk.write.bytes.rate_server_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cmaui_port_4_test_nested2Level: + disk.latency_server_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.usage_server_cmaui_test_nested2Level: + vcpus_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.requests_server_cmaui_test_nested3Level_test_nested2Level: + 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: + network.outgoing.bytes_cmaui_port_4_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_5_test_nested3Level_test_nested2Level: + disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_util_server_cmaui_test_nested3Level_test_nested2Level: + disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.root.size_server_cmaui: + network.incoming.packets_cmaui_port_5_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.latency_server_cmaui_test_nested3Level_test_nested2Level: + disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + disk.device.write.bytes.rate_server_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - vcpus_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + disk.device.read.requests_server_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.capacity_server_cmaui_test_nested3Level_test_nested2Level: + 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 - disk.device.write.requests.rate_server_cmaui_test_nested2Level: + memory.resident_server_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_2: + disk.device.iops_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_server_cmaui: + disk.allocation_server_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + 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: @@ -3189,62 +3108,60 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_server_cmaui_test_nested2Level: + memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_server_cmaui_test_nested3Level_test_nested2Level: + disk.device.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_util_server_cmaui_test_nested2Level: + disk.write.requests_server_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level: + 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 - network.outpoing.packets_cmaui_port_3_test_nested2Level: + disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_server_cmaui_test_nested3Level_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - host_server_cmaui_test_nested2Level: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_6_test_nested3Level_test_nested2Level: + network.outpoing.packets_cmaui_port_3_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory_server_cmaui_test_nested3Level_test_nested2Level: + network.incoming.packets_cmaui_port_6_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3257,36 +3174,36 @@ node_types: occurrences: - 0 - UNBOUNDED - disk.device.read.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level: + disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_4_test_nested2Level: + disk.device.read.bytes.rate_server_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_test_nested4Level_test_nested3Level_test_nested2Level: - type: tosca.capabilities.Node + network.incoming.packets.rate_cmaui_port_4_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.latency_server_cmaui_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_test_nested4Level_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.write.requests_server_cmaui_test_nested3Level_test_nested2Level: + 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 - vcpus_server_cmaui_test_nested2Level: + disk.device.usage_server_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3297,19 +3214,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level: + cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_2: + disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.iops_server_cmaui_test_nested2Level: + 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: @@ -3326,142 +3243,140 @@ node_types: occurrences: - 1 - UNBOUNDED - memory.usage_server_cmaui_test_nested2Level: + network.outgoing.packets.rate_cmaui_port_5_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.iops_server_cmaui: + network.outgoing.bytes.rate_cmaui_port_4_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_5_test_nested3Level_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + endpoint_server_cmaui_3_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_4_test_nested2Level: + binding_server_cmaui_3_test_nested3Level_test_nested2Level: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes_server_cmaui: + disk.iops_server_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.requests_server_cmaui_test_nested2Level: + 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 - feature_server_cmaui_test_nested3Level_test_nested2Level: + feature_server_cmaui_1: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - memory_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + 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 - cpu_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_server_cmaui: + network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.iops_server_cmaui_test_nested3Level_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_cmaui_port_2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + instance_server_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level: + 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.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + 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 - attachment_cmaui_port_2: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - disk.device.capacity_server_cmaui: + network.incoming.packets.rate_cmaui_port_3_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_1: + disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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. + attachment_cmaui_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_3_test_nested2Level: + network.outgoing.packets.rate_cmaui_port_3_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_1: - type: tosca.capabilities.Attachment + network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_server_cmaui_test_nested2Level: + 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 - network.outgoing.packets.rate_cmaui_port_3_test_nested2Level: + disk.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: + cpu.delta_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests_server_cmaui_test_nested3Level_test_nested2Level: + 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: @@ -3473,30 +3388,36 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + memory_server_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + disk.usage_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory_server_cmaui: + disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - scalable_server_cmaui_test_nested2Level: - type: tosca.capabilities.Scalable + os_server_cmaui_1: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.usage_server_cmaui_test_nested2Level: + disk.root.size_server_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3518,19 +3439,31 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + cpu_util_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.latency_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.allocation_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + disk.ephemeral.size_server_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.resident_server_cmaui_test_nested2Level: + disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3542,25 +3475,42 @@ node_types: occurrences: - 1 - UNBOUNDED - host_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + host_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: tosca.capabilities.Container valid_source_types: - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - feature_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: - type: tosca.capabilities.Node + disk.capacity_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - host_server_cmaui_test_nested3Level_test_nested2Level: + host_server_cmaui_1: type: tosca.capabilities.Container valid_source_types: - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED + feature_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + binding_server_cmaui_2_test_nested2Level: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + cpu.delta_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED network.outpoing.packets_cmaui_port_4_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3574,37 +3524,49 @@ node_types: occurrences: - 0 - UNBOUNDED - disk.device.write.requests_server_cmaui_test_nested2Level: + disk.device.capacity_server_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.resident_server_cmaui: + disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_server_cmaui_test_nested2Level: + memory.usage_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.latency_server_cmaui: + scalable_server_cmaui_2_test_nested2Level: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + host_server_cmaui_3_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent + occurrences: + - 1 + - UNBOUNDED + disk.iops_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.allocation_server_cmaui_test_nested2Level: + vcpus_server_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.allocation_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + 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: @@ -3628,13 +3590,25 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_server_cmaui: + disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu.delta_server_cmaui_test_nested2Level: + 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.write.requests.rate_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes_server_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3650,13 +3624,25 @@ node_types: occurrences: - 1 - UNBOUNDED + disk.device.usage_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.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.rate_cmaui_port_3_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.resident_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + disk.device.capacity_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3668,18 +3654,32 @@ node_types: occurrences: - 1 - UNBOUNDED - endpoint_server_cmaui: - type: tosca.capabilities.Endpoint.Admin + 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 - disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.allocation_server_cmaui_test_nested3Level_test_nested2Level: + 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 + host_server_cmaui_2_test_nested2Level: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent + 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: @@ -4314,6 +4314,20 @@ node_types: occurrences: - 1 - 1 + - 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_4: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -4354,6 +4368,20 @@ node_types: occurrences: - 1 - 1 + - dependency_server_cmaui_4_test_nested4Level_test_nested3Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - local_storage_server_cmaui_4_test_nested4Level_test_nested3Level: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED - dependency_cmaui_port_8_test_nested4Level_test_nested3Level: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -4367,14 +4395,14 @@ node_types: occurrences: - 1 - 1 - - dependency_server_cmaui_test_nested4Level_test_nested3Level: + - dependency_server_cmaui_3_test_nested3Level: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_server_cmaui_test_nested4Level_test_nested3Level: + - local_storage_server_cmaui_3_test_nested3Level: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage relationship: tosca.relationships.AttachesTo @@ -4407,161 +4435,109 @@ node_types: occurrences: - 1 - 1 - - dependency_server_cmaui_test_nested3Level: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - local_storage_server_cmaui_test_nested3Level: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: - - 0 - - UNBOUNDED - - 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: - type: org.openecomp.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: + instance_server_cmaui_4_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level: + memory.usage_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - vcpus_server_cmaui_test_nested3Level: + cpu_util_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.allocation_server_cmaui: + disk.device.usage_server_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.latency_server_cmaui_test_nested3Level: + disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level: + disk.device.latency_server_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - scalable_server_cmaui: - type: tosca.capabilities.Scalable - occurrences: - - 1 - - UNBOUNDED - disk.read.bytes.rate_server_cmaui: + network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.resident_server_cmaui_test_nested4Level_test_nested3Level: + disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level: + 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 - disk.capacity_server_cmaui_test_nested4Level_test_nested3Level: + 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 - host_server_cmaui: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent - occurrences: - - 1 - - UNBOUNDED - cpu_util_server_cmaui: + disk.read.requests_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - os_server_cmaui_test_nested3Level: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level: + disk.latency_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level: + disk.write.bytes.rate_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.usage_server_cmaui_test_nested4Level_test_nested3Level: + network.outgoing.bytes_cmaui_port_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cmaui_port_3: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + endpoint_server_cmaui_4_test_nested4Level_test_nested3Level: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.device.write.requests_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 - instance_server_cmaui_test_nested4Level_test_nested3Level: + cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_server_cmaui_test_nested3Level: + disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4572,26 +4548,27 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.bytes_server_cmaui_test_nested3Level: + network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level: + disk.device.iops_server_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level: + disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_server_cmaui_test_nested3Level: - type: tosca.capabilities.Node + 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 @@ -4600,191 +4577,191 @@ node_types: occurrences: - 1 - UNBOUNDED - memory.usage_server_cmaui_test_nested3Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + host_server_cmaui_4_test_nested4Level_test_nested3Level: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - instance_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 - disk.device.read.bytes_server_cmaui: + disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_server_cmaui_test_nested3Level: - type: tosca.capabilities.network.Bindable - occurrences: - - 1 - - UNBOUNDED - disk.root.size_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_test_nested3Level: + disk.device.read.bytes_server_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_5_test_nested3Level: + disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_3: + disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - os_server_cmaui: - type: tosca.capabilities.OperatingSystem + 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.write.bytes.rate_server_cmaui: + disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_4: + network.outgoing.bytes.rate_cmaui_port_5_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level: + memory_server_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cmaui_port_6_test_nested3Level: + cpu_server_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + host_server_cmaui_3_test_nested3Level: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_server_cmaui_test_nested3Level: + network.incoming.packets_cmaui_port_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_6_test_nested3Level: + disk.allocation_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level: + memory_server_cmaui_4_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_port_5_test_nested3Level: + network.incoming.packets_cmaui_port_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - vcpus_server_cmaui_test_nested4Level_test_nested3Level: + network.outgoing.bytes_cmaui_port_6_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_6_test_nested3Level: + network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_util_server_cmaui_test_nested3Level: + network.incoming.packets.rate_cmaui_port_6_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level: + 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 - endpoint_server_cmaui_test_nested4Level_test_nested3Level: - type: tosca.capabilities.Endpoint.Admin + cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_6_test_nested3Level: + disk.write.requests_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.allocation_server_cmaui_test_nested3Level: + network.outpoing.packets_cmaui_port_5_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.resident_server_cmaui_test_nested3Level: + disk.capacity_server_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level: + network.incoming.packets_cmaui_port_6_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu.delta_server_cmaui_test_nested3Level: + network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_server_cmaui_test_nested3Level: + network.outgoing.bytes.rate_cmaui_port_6_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests_server_cmaui_test_nested3Level: + disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level: + disk.read.bytes.rate_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_server_cmaui: - type: tosca.capabilities.Node + disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -4795,7 +4772,7 @@ node_types: occurrences: - 0 - UNBOUNDED - disk.device.read.bytes.rate_server_cmaui_test_nested3Level: + disk.iops_server_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4808,24 +4785,7 @@ node_types: occurrences: - 0 - UNBOUNDED - disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - endpoint_server_cmaui_test_nested3Level: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED - disk.device.write.requests_server_cmaui_test_nested3Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - memory.usage_server_cmaui: + 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: @@ -4841,7 +4801,7 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_server_cmaui: + memory_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4853,19 +4813,24 @@ node_types: occurrences: - 1 - UNBOUNDED - memory_server_cmaui_test_nested4Level_test_nested3Level: + feature_server_cmaui_3_test_nested3Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_cmaui_port_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_3: + disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.usage_server_cmaui_test_nested3Level: + disk.root.size_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4884,19 +4849,24 @@ node_types: occurrences: - 0 - UNBOUNDED - disk.iops_server_cmaui: + disk.usage_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cmaui_port_4: + os_server_cmaui_4_test_nested4Level_test_nested3Level: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.iops_server_cmaui_test_nested4Level_test_nested3Level: + network.incoming.bytes_cmaui_port_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4908,194 +4878,208 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.iops_server_cmaui: + disk.device.read.requests.rate_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes_server_cmaui: + disk.device.latency_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.root.size_server_cmaui_test_nested3Level: + 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.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level: + memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level: + disk.device.write.requests.rate_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_server_cmaui_test_nested4Level_test_nested3Level: + network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_cmaui_port_7_test_nested4Level_test_nested3Level: - 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 - cpu_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 - network.incoming.packets.rate_cmaui_port_3: + disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_cmaui_port_3: - type: tosca.capabilities.Node + vcpus_server_cmaui_4_test_nested4Level_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_4: + network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_cmaui_port_4: - type: tosca.capabilities.Node + 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 - attachment_cmaui_port_6_test_nested3Level: - type: tosca.capabilities.Attachment + feature_cmaui_port_7_test_nested4Level_test_nested3Level: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_server_cmaui: + disk.iops_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level: + network.incoming.packets.rate_cmaui_port_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_6_test_nested3Level: + cpu_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - 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_cmaui_port_3: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_4: + 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 - disk.write.requests.rate_server_cmaui_test_nested3Level: + network.incoming.packets.rate_cmaui_port_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_3: - type: tosca.capabilities.Attachment + feature_server_cmaui_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_cmaui_port_4: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_4: + attachment_cmaui_port_6_test_nested3Level: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.iops_server_cmaui_test_nested3Level: + network.outgoing.packets.rate_cmaui_port_6_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - host_server_cmaui_test_nested4Level_test_nested3Level: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + 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.latency_server_cmaui: + disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - 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. + binding_server_cmaui_2: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - disk.device.allocation_server_cmaui_test_nested3Level: + vcpus_server_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests_server_cmaui_test_nested4Level_test_nested3Level: + network.outgoing.packets.rate_cmaui_port_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_server_cmaui: + instance_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.usage_server_cmaui: + attachment_cmaui_port_3: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + attachment_cmaui_port_4: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + scalable_server_cmaui_2: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_3: + disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.usage_server_cmaui: + network.outgoing.packets.rate_cmaui_port_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.iops_server_cmaui_test_nested3Level: + disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5107,41 +5091,47 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.allocation_server_cmaui_test_nested4Level_test_nested3Level: + disk.write.requests_server_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.capacity_server_cmaui: + memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_server_cmaui: + network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - os_server_cmaui_test_nested4Level_test_nested3Level: - type: tosca.capabilities.OperatingSystem + 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 - network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level: + disk.device.usage_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.latency_server_cmaui_test_nested3Level: + disk.write.bytes_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + feature_server_cmaui_4_test_nested4Level_test_nested3Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED network.incoming.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5155,39 +5145,42 @@ node_types: occurrences: - 0 - UNBOUNDED - disk.root.size_server_cmaui_test_nested4Level_test_nested3Level: + disk.write.requests.rate_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests_server_cmaui: + disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + endpoint_server_cmaui_2: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED network.incoming.bytes_cmaui_port_6_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - 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 - disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level: + disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.requests_server_cmaui_test_nested3Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_server_cmaui_4_test_nested4Level_test_nested3Level: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED @@ -5197,217 +5190,193 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_server_cmaui: - type: tosca.capabilities.network.Bindable + attachment_cmaui_port_5_test_nested3Level: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level: + disk.device.allocation_server_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level: + network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level: + disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_5_test_nested3Level: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - disk.device.read.requests.rate_server_cmaui: + disk.read.bytes_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_server_cmaui_test_nested4Level_test_nested3Level: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - binding_server_cmaui_test_nested4Level_test_nested3Level: - type: tosca.capabilities.network.Bindable - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level: + disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level: + disk.device.allocation_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes_server_cmaui: + network.incoming.bytes.rate_cmaui_port_5_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - host_server_cmaui_test_nested3Level: + host_server_cmaui_2: type: tosca.capabilities.Container valid_source_types: - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - scalable_server_cmaui_test_nested4Level_test_nested3Level: - type: tosca.capabilities.Scalable + os_server_cmaui_3_test_nested3Level: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_port_5_test_nested3Level: + disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level: + disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_test_nested3Level: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - disk.device.write.bytes_server_cmaui_test_nested3Level: + network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_server_cmaui_3_test_nested3Level: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_8_test_nested4Level_test_nested3Level: - type: tosca.capabilities.Attachment + feature_test_nested3Level: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_server_cmaui_test_nested3Level: + network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_server_cmaui_test_nested3Level: + cpu_server_cmaui_4_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_server_cmaui_test_nested3Level: + cpu.delta_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.capacity_server_cmaui_test_nested3Level: + disk.device.capacity_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.usage_server_cmaui_test_nested4Level_test_nested3Level: + disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_cmaui_port_8_test_nested4Level_test_nested3Level: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - memory.resident_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_3_test_nested3Level: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cmaui_port_5_test_nested3Level: + instance_server_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level: + disk.device.iops_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level: + network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests_server_cmaui_test_nested3Level: + network.incoming.bytes_cmaui_port_5_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.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. + endpoint_server_cmaui_3_test_nested3Level: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_port_6_test_nested3Level: + vcpus_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - vcpus_server_cmaui: + network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cmaui_port_4: + disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level: + network.outpoing.packets_cmaui_port_6_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_server_cmaui: + network.outgoing.bytes_cmaui_port_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - instance_server_cmaui_test_nested3Level: + network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5432,49 +5401,61 @@ node_types: occurrences: - 1 - UNBOUNDED + disk.device.write.bytes_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED network.outgoing.bytes_cmaui_port_5_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_util_server_cmaui_test_nested4Level_test_nested3Level: + disk.device.read.requests_server_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.allocation_server_cmaui: + disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - 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 - cpu_server_cmaui_test_nested3Level: + network.outpoing.packets_cmaui_port_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.usage_server_cmaui_test_nested3Level: + disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes_server_cmaui_test_nested3Level: + disk.capacity_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_port_3: + cpu.delta_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.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: @@ -5486,12 +5467,29 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_server_cmaui_4_test_nested4Level_test_nested3Level: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + 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 + disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED binding_cmaui_port_8_test_nested4Level_test_nested3Level: type: tosca.capabilities.network.Bindable valid_source_types: @@ -5499,13 +5497,15 @@ node_types: occurrences: - 0 - UNBOUNDED - scalable_server_cmaui_test_nested3Level: - type: tosca.capabilities.Scalable + disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - endpoint_server_cmaui: - type: tosca.capabilities.Endpoint.Admin + disk.device.read.requests_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -5514,49 +5514,49 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu.delta_server_cmaui_test_nested4Level_test_nested3Level: + network.incoming.packets_cmaui_port_5_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_5_test_nested3Level: + 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.device.iops_server_cmaui_test_nested4Level_test_nested3Level: + disk.ephemeral.size_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_server_cmaui_test_nested3Level: + network.outgoing.packets.rate_cmaui_port_5_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_server_cmaui_test_nested3Level: + disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level: + disk.device.read.bytes_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_5_test_nested3Level: + memory.resident_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.latency_server_cmaui_test_nested4Level_test_nested3Level: + 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: @@ -5636,6 +5636,20 @@ node_types: occurrences: - 1 - 1 + - dependency_server_cmaui_4_test_nested4Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - local_storage_server_cmaui_4_test_nested4Level: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED - dependency_cmaui_port_8_test_nested4Level: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -5649,14 +5663,14 @@ node_types: occurrences: - 1 - 1 - - dependency_server_cmaui_test_nested4Level: + - dependency_server_cmaui_3: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_server_cmaui_test_nested4Level: + - local_storage_server_cmaui_3: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage relationship: tosca.relationships.AttachesTo @@ -5689,245 +5703,251 @@ 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 + capabilities: + memory.usage_server_cmaui_4_test_nested4Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - capabilities: - cpu.delta_server_cmaui: + cpu_util_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_server_cmaui: + 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 - disk.device.allocation_server_cmaui: + 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 - memory_server_cmaui_test_nested4Level: + disk.read.requests_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - scalable_server_cmaui: - type: tosca.capabilities.Scalable + 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.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 - instance_server_cmaui_test_nested4Level: + disk.write.bytes.rate_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.root.size_server_cmaui_test_nested4Level: + disk.latency_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes_server_cmaui_test_nested4Level: + 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 - host_server_cmaui: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + 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 - cpu_util_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 - cpu_server_cmaui_test_nested4Level: + 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 - vcpus_server_cmaui_test_nested4Level: + network.incoming.bytes.rate_cmaui_port_7_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.usage_server_cmaui_test_nested4Level: + feature_server_cmaui_4_test_nested4Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.capacity_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.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 - network.incoming.bytes.rate_cmaui_port_7_test_nested4Level: + network.incoming.bytes.rate_cmaui_port_8_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - instance_server_cmaui: + disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.latency_server_cmaui_test_nested4Level: + disk.device.read.requests_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_server_cmaui: + disk.device.write.requests_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_server_cmaui_test_nested4Level: + 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 - network.incoming.bytes.rate_cmaui_port_8_test_nested4Level: + disk.device.write.requests.rate_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.root.size_server_cmaui: + disk.device.read.bytes_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - host_server_cmaui_test_nested4Level: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + 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 - os_server_cmaui: - type: tosca.capabilities.OperatingSystem + 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.device.write.bytes.rate_server_cmaui: + memory.resident_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_server_cmaui_test_nested4Level: + 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 + binding_server_cmaui_4_test_nested4Level: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED network.incoming.packets_cmaui_port_5: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + os_server_cmaui_4_test_nested4Level: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED network.incoming.packets.rate_cmaui_port_7_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.allocation_server_cmaui_test_nested4Level: + 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 - network.incoming.packets_cmaui_port_6: + cpu.delta_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_server_cmaui_test_nested4Level: + network.incoming.packets_cmaui_port_6: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level: + 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 - disk.device.write.bytes_server_cmaui_test_nested4Level: + disk.device.capacity_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_server_cmaui_test_nested4Level: + network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.iops_server_cmaui_test_nested4Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_server_cmaui_4_test_nested4Level: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - disk.read.requests_server_cmaui_test_nested4Level: + disk.device.iops_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_server_cmaui_test_nested4Level: + disk.read.bytes.rate_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_server_cmaui_test_nested4Level: - type: tosca.capabilities.network.Bindable + endpoint_server_cmaui_4_test_nested4Level: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED @@ -5937,17 +5957,12 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.usage_server_cmaui_test_nested4Level: + vcpus_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_server_cmaui: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED binding_cmaui_port_5: type: tosca.capabilities.network.Bindable valid_source_types: @@ -5968,30 +5983,31 @@ node_types: occurrences: - 0 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_8_test_nested4Level: + 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 - memory.usage_server_cmaui: + network.outgoing.packets.rate_cmaui_port_8_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_server_cmaui: + disk.write.bytes_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_server_cmaui_test_nested4Level: - type: tosca.capabilities.Node + disk.write.requests.rate_server_cmaui_4_test_nested4Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_server_cmaui_test_nested4Level: + 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: @@ -6021,32 +6037,34 @@ 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. + host_server_cmaui_4_test_nested4Level: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - disk.device.iops_server_cmaui: + 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.capacity_server_cmaui_test_nested4Level: + 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: - 1 - UNBOUNDED - disk.read.bytes_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 - scalable_server_cmaui_test_nested4Level: - type: tosca.capabilities.Scalable + 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 @@ -6062,20 +6080,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_server_cmaui_test_nested4Level: + disk.iops_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_cmaui_port_5: + feature_server_cmaui_3: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.allocation_server_cmaui_test_nested4Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_cmaui_port_5: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -6084,19 +6101,7 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_server_cmaui_test_nested4Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - 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 - disk.write.bytes.rate_server_cmaui_test_nested4Level: + cpu_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6107,12 +6112,6 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_server_cmaui_test_nested4Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED binding_cmaui_port_8_test_nested4Level: type: tosca.capabilities.network.Bindable valid_source_types: @@ -6120,19 +6119,19 @@ node_types: occurrences: - 0 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_5: + 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: - 1 - UNBOUNDED - disk.write.bytes.rate_server_cmaui: + network.incoming.packets.rate_cmaui_port_5: type: org.openecomp.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_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: @@ -6143,77 +6142,63 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_7_test_nested4Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_server_cmaui_3: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_5: + 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 - network.outgoing.packets.rate_cmaui_port_6: + network.outgoing.packets.rate_cmaui_port_7_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_5: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - feature_cmaui_port_8_test_nested4Level: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - disk.device.latency_server_cmaui: + instance_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.requests_server_cmaui: + network.outgoing.packets.rate_cmaui_port_5: type: org.openecomp.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. + scalable_server_cmaui_3: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - disk.usage_server_cmaui: + network.outgoing.packets.rate_cmaui_port_6: type: org.openecomp.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: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_cmaui_port_5: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_port_7_test_nested4Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_cmaui_port_8_test_nested4Level: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.capacity_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.write.requests.rate_server_cmaui: + network.outpoing.packets_cmaui_port_7_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6224,19 +6209,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level: + 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.iops_server_cmaui_test_nested4Level: + disk.device.write.bytes_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests_server_cmaui: + network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6247,30 +6232,29 @@ node_types: occurrences: - 1 - UNBOUNDED - endpoint_server_cmaui_test_nested4Level: + endpoint_server_cmaui_3: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_6: + memory_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory_server_cmaui: + network.incoming.packets.rate_cmaui_port_6: type: org.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_nested4Level: - 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.resident_server_cmaui_test_nested4Level: + disk.root.size_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6283,88 +6267,97 @@ node_types: occurrences: - 0 - UNBOUNDED - binding_server_cmaui: - type: tosca.capabilities.network.Bindable + disk.usage_server_cmaui_4_test_nested4Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_server_cmaui: + disk.device.latency_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes_server_cmaui: + disk.device.read.requests.rate_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cmaui_port_7_test_nested4Level: + disk.ephemeral.size_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes_server_cmaui_test_nested4Level: + 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 - disk.device.read.requests_server_cmaui_test_nested4Level: + disk.read.bytes_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests_server_cmaui_test_nested4Level: + disk.allocation_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.latency_server_cmaui_test_nested4Level: + network.outgoing.bytes_cmaui_port_7_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_7_test_nested4Level: + disk.device.allocation_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_test_nested4Level: - type: tosca.capabilities.Node + host_server_cmaui_3: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - os_server_cmaui_test_nested4Level: - type: tosca.capabilities.OperatingSystem + disk.write.requests_server_cmaui_4_test_nested4Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_port_6: + network.incoming.packets_cmaui_port_7_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.resident_server_cmaui: + feature_test_nested4Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_cmaui_port_6: type: org.openecomp.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_8_test_nested4Level: + 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 - memory.usage_server_cmaui_test_nested4Level: + network.incoming.packets.rate_cmaui_port_8_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6376,19 +6369,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.latency_server_cmaui: + network.outgoing.bytes_cmaui_port_6: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cmaui_port_6: + network.outpoing.packets_cmaui_port_6: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_port_6: + 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: @@ -6400,56 +6393,63 @@ node_types: occurrences: - 1 - UNBOUNDED - vcpus_server_cmaui: + disk.device.usage_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_server_cmaui: + disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_server_cmaui_test_nested4Level: + network.incoming.bytes.rate_cmaui_port_5: type: org.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_nested4Level: + 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 - network.incoming.bytes.rate_cmaui_port_5: + network.incoming.bytes_cmaui_port_7_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.allocation_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.write.requests_server_cmaui: + 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 - network.incoming.bytes_cmaui_port_7_test_nested4Level: + 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 - endpoint_server_cmaui: - type: tosca.capabilities.Endpoint.Admin + 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 + 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
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml index c3d230d7b3..ace6aa3818 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml @@ -144,99 +144,105 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested1 capabilities: - os_server_cmaui_test_nested2Level: + memory.resident_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - os_server_cmaui - disk.device.write.requests.rate_server_cmaui: - - abstract_cmaui_2 - - disk.device.write.requests.rate_cmaui - disk.device.allocation_server_cmaui: - - abstract_cmaui_2 - - disk.device.allocation_cmaui - disk.device.allocation_server_cmaui_test_nested3Level_test_nested2Level: - - test_nested2Level - - disk.device.allocation_server_cmaui_test_nested3Level + - memory.resident_server_cmaui_3_test_nested3Level network.outpoing.packets_cmaui_port_6_test_nested3Level_test_nested2Level: - test_nested2Level - network.outpoing.packets_cmaui_port_6_test_nested3Level binding_cmaui_port_6_test_nested3Level_test_nested2Level: - test_nested2Level - binding_cmaui_port_6_test_nested3Level - disk.ephemeral.size_server_cmaui_test_nested3Level_test_nested2Level: - - test_nested2Level - - disk.ephemeral.size_server_cmaui_test_nested3Level - disk.device.usage_server_cmaui_test_nested3Level_test_nested2Level: + memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - - disk.device.usage_server_cmaui_test_nested3Level - host_server_cmaui: + - memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level + disk.device.latency_server_cmaui_1: - abstract_cmaui_2 - - host_cmaui - disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + - disk.device.latency_cmaui + disk.device.latency_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level - disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + - disk.device.latency_server_cmaui_3_test_nested3Level + disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - - disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level - feature_server_cmaui_test_nested2Level: + - disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level + disk.root.size_server_cmaui_1: + - abstract_cmaui_2 + - disk.root.size_cmaui + scalable_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - feature_server_cmaui + - scalable_server_cmaui_3_test_nested3Level network.outgoing.bytes_cmaui_port_2: - abstract_cmaui_2 - network.outgoing.bytes_cmaui_cmaui_port_2 - endpoint_server_cmaui_test_nested3Level_test_nested2Level: - - test_nested2Level - - endpoint_server_cmaui_test_nested3Level + disk.read.requests_server_cmaui_1: + - abstract_cmaui_2 + - disk.read.requests_cmaui network.outgoing.bytes_cmaui_port_1: - abstract_cmaui_2 - network.outgoing.bytes_cmaui_cmaui_port_1 binding_cmaui_port_5_test_nested3Level_test_nested2Level: - test_nested2Level - binding_cmaui_port_5_test_nested3Level - disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + endpoint_server_cmaui_2_test_nested2Level: + - test_nested2Level + - endpoint_server_cmaui_2 + binding_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - - disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level - instance_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + - binding_server_cmaui_4_test_nested4Level_test_nested3Level + disk.latency_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - instance_server_cmaui_test_nested4Level_test_nested3Level + - disk.latency_server_cmaui_3_test_nested3Level network.incoming.packets_cmaui_port_3_test_nested2Level: - test_nested2Level - network.incoming.packets_cmaui_port_3 - feature_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: - - test_nested2Level - - feature_server_cmaui_test_nested4Level_test_nested3Level - disk.root.size_server_cmaui_test_nested2Level: - - test_nested2Level - - disk.root.size_server_cmaui - disk.write.requests_server_cmaui_test_nested3Level_test_nested2Level: - - test_nested2Level - - disk.write.requests_server_cmaui_test_nested3Level binding_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - binding_cmaui_port_8_test_nested4Level_test_nested3Level - disk.root.size_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + disk.device.read.bytes.rate_server_cmaui_1: + - abstract_cmaui_2 + - disk.device.read.bytes.rate_cmaui + feature_server_cmaui_2_test_nested2Level: + - test_nested2Level + - feature_server_cmaui_2 + disk.read.bytes_server_cmaui_1: + - abstract_cmaui_2 + - disk.read.bytes_cmaui + disk.capacity_server_cmaui_2_test_nested2Level: - test_nested2Level - - disk.root.size_server_cmaui_test_nested4Level_test_nested3Level - disk.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + - disk.capacity_server_cmaui_2 + disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - - disk.usage_server_cmaui_test_nested4Level_test_nested3Level - instance_server_cmaui: + - disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level + disk.device.read.bytes_server_cmaui_1: - abstract_cmaui_2 - - instance_cmaui - cpu.delta_server_cmaui_test_nested3Level_test_nested2Level: + - disk.device.read.bytes_cmaui + disk.device.write.requests_server_cmaui_2_test_nested2Level: - test_nested2Level - - cpu.delta_server_cmaui_test_nested3Level + - disk.device.write.requests_server_cmaui_2 + disk.write.requests.rate_server_cmaui_1: + - abstract_cmaui_2 + - disk.write.requests.rate_cmaui network.incoming.packets.rate_cmaui_port_6_test_nested3Level_test_nested2Level: - test_nested2Level - network.incoming.packets.rate_cmaui_port_6_test_nested3Level + disk.device.read.bytes_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.read.bytes_server_cmaui_2 network.incoming.packets_cmaui_port_4_test_nested2Level: - test_nested2Level - network.incoming.packets_cmaui_port_4 network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level - cpu_server_cmaui_test_nested2Level: + cpu_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: + - test_nested2Level + - cpu_server_cmaui_4_test_nested4Level_test_nested3Level + disk.device.write.requests.rate_server_cmaui_2_test_nested2Level: - test_nested2Level - - cpu_server_cmaui + - disk.device.write.requests.rate_server_cmaui_2 + disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level network.incoming.bytes_cmaui_port_3_test_nested2Level: - test_nested2Level - network.incoming.bytes_cmaui_port_3 @@ -246,129 +252,105 @@ topology_template: network.incoming.packets.rate_cmaui_port_5_test_nested3Level_test_nested2Level: - test_nested2Level - network.incoming.packets.rate_cmaui_port_5_test_nested3Level - os_server_cmaui: - - abstract_cmaui_2 - - os_cmaui - memory.resident_server_cmaui_test_nested3Level_test_nested2Level: + disk.read.bytes_server_cmaui_2_test_nested2Level: - test_nested2Level - - memory.resident_server_cmaui_test_nested3Level + - disk.read.bytes_server_cmaui_2 binding_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - binding_cmaui_port_7_test_nested4Level_test_nested3Level - os_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: - - test_nested2Level - - os_server_cmaui_test_nested4Level_test_nested3Level - disk.device.read.requests.rate_server_cmaui_test_nested3Level_test_nested2Level: - - test_nested2Level - - disk.device.read.requests.rate_server_cmaui_test_nested3Level network.incoming.bytes.rate_cmaui_port_4_test_nested2Level: - test_nested2Level - network.incoming.bytes.rate_cmaui_port_4 - disk.write.bytes_server_cmaui_test_nested2Level: - - test_nested2Level - - disk.write.bytes_server_cmaui - scalable_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: - - test_nested2Level - - scalable_server_cmaui_test_nested4Level_test_nested3Level - instance_server_cmaui_test_nested2Level: - - test_nested2Level - - instance_server_cmaui network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level - endpoint_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + disk.device.allocation_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.allocation_server_cmaui_2 + disk.ephemeral.size_server_cmaui_1: + - abstract_cmaui_2 + - disk.ephemeral.size_cmaui + disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - - endpoint_server_cmaui_test_nested4Level_test_nested3Level - disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + - disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level + disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - - disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level + - disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level network.outgoing.bytes.rate_cmaui_port_5_test_nested3Level_test_nested2Level: - test_nested2Level - network.outgoing.bytes.rate_cmaui_port_5_test_nested3Level network.incoming.bytes.rate_cmaui_port_6_test_nested3Level_test_nested2Level: - test_nested2Level - network.incoming.bytes.rate_cmaui_port_6_test_nested3Level - disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - - disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level - disk.read.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level: + - disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level + disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - - disk.read.bytes.rate_server_cmaui_test_nested3Level - disk.capacity_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + - disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level + instance_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - disk.capacity_server_cmaui_test_nested4Level_test_nested3Level - disk.latency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: - - test_nested2Level - - disk.latency_server_cmaui_test_nested4Level_test_nested3Level - feature_server_cmaui: - - abstract_cmaui_2 - - feature_cmaui + - instance_server_cmaui_3_test_nested3Level binding_cmaui_port_1: - abstract_cmaui_2 - binding_cmaui_cmaui_port_1 binding_cmaui_port_2: - abstract_cmaui_2 - binding_cmaui_cmaui_port_2 - binding_server_cmaui_test_nested3Level_test_nested2Level: - - test_nested2Level - - binding_server_cmaui_test_nested3Level feature_test_nested2Level: - test_nested2Level - feature - memory.usage_server_cmaui: - - abstract_cmaui_2 - - memory.usage_cmaui - disk.ephemeral.size_server_cmaui: + disk.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.write.requests_server_cmaui_3_test_nested3Level + disk.device.write.requests_server_cmaui_1: - abstract_cmaui_2 - - disk.ephemeral.size_cmaui - os_server_cmaui_test_nested3Level_test_nested2Level: + - disk.device.write.requests_cmaui + cpu_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - os_server_cmaui_test_nested3Level + - cpu_server_cmaui_3_test_nested3Level + disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level - cpu_util_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: - - test_nested2Level - - cpu_util_server_cmaui_test_nested4Level_test_nested3Level - disk.write.bytes_server_cmaui_test_nested3Level_test_nested2Level: - - test_nested2Level - - disk.write.bytes_server_cmaui_test_nested3Level - disk.device.read.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: - - test_nested2Level - - disk.device.read.requests_server_cmaui_test_nested4Level_test_nested3Level - disk.device.iops_server_cmaui: + disk.device.write.bytes.rate_server_cmaui_1: - abstract_cmaui_2 - - disk.device.iops_cmaui + - disk.device.write.bytes.rate_cmaui + cpu_util_server_cmaui_1: + - abstract_cmaui_2 + - cpu_util_cmaui network.incoming.bytes.rate_cmaui_port_5_test_nested3Level_test_nested2Level: - test_nested2Level - network.incoming.bytes.rate_cmaui_port_5_test_nested3Level network.incoming.bytes_cmaui_port_2: - abstract_cmaui_2 - network.incoming.bytes_cmaui_cmaui_port_2 - disk.device.iops_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: - - test_nested2Level - - disk.device.iops_server_cmaui_test_nested4Level_test_nested3Level network.incoming.bytes_cmaui_port_1: - abstract_cmaui_2 - network.incoming.bytes_cmaui_cmaui_port_1 network.incoming.bytes_cmaui_port_5_test_nested3Level_test_nested2Level: - test_nested2Level - network.incoming.bytes_cmaui_port_5_test_nested3Level + disk.write.bytes.rate_server_cmaui_1: + - abstract_cmaui_2 + - disk.write.bytes.rate_cmaui + disk.device.write.bytes_server_cmaui_1: + - abstract_cmaui_2 + - disk.device.write.bytes_cmaui + disk.device.read.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.device.read.requests.rate_server_cmaui_3_test_nested3Level network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level - disk.device.read.requests_server_cmaui_test_nested2Level: - - test_nested2Level - - disk.device.read.requests_server_cmaui network.incoming.packets.rate_cmaui_port_1: - abstract_cmaui_2 - network.incoming.packets.rate_cmaui_cmaui_port_1 network.incoming.packets.rate_cmaui_port_2: - abstract_cmaui_2 - network.incoming.packets.rate_cmaui_cmaui_port_2 - cpu_server_cmaui: - - abstract_cmaui_2 - - cpu_cmaui network.incoming.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - network.incoming.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level @@ -378,402 +360,369 @@ topology_template: feature_cmaui_port_2: - abstract_cmaui_2 - feature_cmaui_cmaui_port_2 - disk.device.read.bytes.rate_server_cmaui: - - abstract_cmaui_2 - - disk.device.read.bytes.rate_cmaui - disk.device.read.requests.rate_server_cmaui_test_nested2Level: + cpu_server_cmaui_2_test_nested2Level: - test_nested2Level - - disk.device.read.requests.rate_server_cmaui - disk.device.latency_server_cmaui_test_nested2Level: + - cpu_server_cmaui_2 + disk.ephemeral.size_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - disk.device.latency_server_cmaui - disk.device.latency_server_cmaui: - - abstract_cmaui_2 - - disk.device.latency_cmaui - disk.read.requests_server_cmaui: + - disk.ephemeral.size_server_cmaui_3_test_nested3Level + binding_server_cmaui_1: - abstract_cmaui_2 - - disk.read.requests_cmaui - disk.usage_server_cmaui: - - abstract_cmaui_2 - - disk.usage_cmaui - disk.device.usage_server_cmaui: - - abstract_cmaui_2 - - disk.device.usage_cmaui - disk.capacity_server_cmaui: - - abstract_cmaui_2 - - disk.capacity_cmaui - disk.write.requests.rate_server_cmaui: + - binding_cmaui + disk.root.size_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.root.size_server_cmaui_3_test_nested3Level + os_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - os_server_cmaui_3_test_nested3Level + disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level + cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: + - test_nested2Level + - cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level + scalable_server_cmaui_1: - abstract_cmaui_2 - - disk.write.requests.rate_cmaui + - scalable_cmaui + disk.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.write.bytes_server_cmaui_3_test_nested3Level + memory_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: + - test_nested2Level + - memory_server_cmaui_4_test_nested4Level_test_nested3Level + disk.device.write.bytes_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.write.bytes_server_cmaui_2 network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level - disk.write.bytes.rate_server_cmaui_test_nested2Level: - - test_nested2Level - - disk.write.bytes.rate_server_cmaui network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level - disk.device.read.requests_server_cmaui: + endpoint_server_cmaui_1: - abstract_cmaui_2 - - disk.device.read.requests_cmaui - disk.iops_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: - - test_nested2Level - - disk.iops_server_cmaui_test_nested4Level_test_nested3Level - disk.device.iops_server_cmaui_test_nested3Level_test_nested2Level: - - test_nested2Level - - disk.device.iops_server_cmaui_test_nested3Level + - endpoint_cmaui network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level - disk.write.requests.rate_server_cmaui_test_nested2Level: + os_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - - disk.write.requests.rate_server_cmaui - binding_server_cmaui: - - abstract_cmaui_2 - - binding_cmaui + - os_server_cmaui_4_test_nested4Level_test_nested3Level + disk.usage_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.usage_server_cmaui_2 network.outgoing.packets.rate_cmaui_port_4_test_nested2Level: - test_nested2Level - network.outgoing.packets.rate_cmaui_port_4 - disk.device.read.requests.rate_server_cmaui: - - abstract_cmaui_2 - - disk.device.read.requests.rate_cmaui - vcpus_server_cmaui_test_nested3Level_test_nested2Level: + disk.device.read.requests.rate_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.read.requests.rate_server_cmaui_2 + disk.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - vcpus_server_cmaui_test_nested3Level + - disk.read.bytes.rate_server_cmaui_3_test_nested3Level + disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level + disk.device.allocation_server_cmaui_1: + - abstract_cmaui_2 + - disk.device.allocation_cmaui network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level - disk.device.capacity_server_cmaui_test_nested3Level_test_nested2Level: - - test_nested2Level - - disk.device.capacity_server_cmaui_test_nested3Level - disk.write.bytes_server_cmaui: + memory_server_cmaui_1: - abstract_cmaui_2 - - disk.write.bytes_cmaui - endpoint_server_cmaui_test_nested2Level: + - memory_cmaui + disk.device.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - endpoint_server_cmaui + - disk.device.write.bytes_server_cmaui_3_test_nested3Level + disk.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.write.requests.rate_server_cmaui_3_test_nested3Level network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level - disk.write.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level: - - test_nested2Level - - disk.write.bytes.rate_server_cmaui_test_nested3Level - disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + os_server_cmaui_2_test_nested2Level: - test_nested2Level - - disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level + - os_server_cmaui_2 network.outgoing.bytes_cmaui_port_5_test_nested3Level_test_nested2Level: - test_nested2Level - network.outgoing.bytes_cmaui_port_5_test_nested3Level - cpu_server_cmaui_test_nested3Level_test_nested2Level: + disk.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.read.requests_server_cmaui_3_test_nested3Level + vcpus_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - - cpu_server_cmaui_test_nested3Level - disk.device.read.bytes.rate_server_cmaui_test_nested2Level: + - vcpus_server_cmaui_4_test_nested4Level_test_nested3Level + disk.device.capacity_server_cmaui_1: + - abstract_cmaui_2 + - disk.device.capacity_cmaui + disk.device.iops_server_cmaui_2_test_nested2Level: - test_nested2Level - - disk.device.read.bytes.rate_server_cmaui + - disk.device.iops_server_cmaui_2 network.incoming.bytes_cmaui_port_4_test_nested2Level: - test_nested2Level - network.incoming.bytes_cmaui_port_4 feature_cmaui_port_3_test_nested2Level: - test_nested2Level - feature_cmaui_port_3 + disk.read.bytes.rate_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.read.bytes.rate_server_cmaui_2 network.outpoing.packets_cmaui_port_5_test_nested3Level_test_nested2Level: - test_nested2Level - network.outpoing.packets_cmaui_port_5_test_nested3Level - disk.root.size_server_cmaui_test_nested3Level_test_nested2Level: + instance_server_cmaui_1: + - abstract_cmaui_2 + - instance_cmaui + instance_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - - disk.root.size_server_cmaui_test_nested3Level - memory.usage_server_cmaui_test_nested3Level_test_nested2Level: + - instance_server_cmaui_4_test_nested4Level_test_nested3Level + memory_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - memory.usage_server_cmaui_test_nested3Level + - memory_server_cmaui_3_test_nested3Level attachment_cmaui_port_3_test_nested2Level: - test_nested2Level - attachment_cmaui_port_3 - binding_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: - - test_nested2Level - - binding_server_cmaui_test_nested4Level_test_nested3Level - vcpus_server_cmaui: - - abstract_cmaui_2 - - vcpus_cmaui - disk.device.write.bytes_server_cmaui: - - abstract_cmaui_2 - - disk.device.write.bytes_cmaui - disk.read.bytes_server_cmaui_test_nested3Level_test_nested2Level: - - test_nested2Level - - disk.read.bytes_server_cmaui_test_nested3Level - instance_server_cmaui_test_nested3Level_test_nested2Level: - - test_nested2Level - - instance_server_cmaui_test_nested3Level - memory_server_cmaui_test_nested2Level: - - test_nested2Level - - memory_server_cmaui - disk.allocation_server_cmaui: - - abstract_cmaui_2 - - disk.allocation_cmaui - disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + endpoint_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - - disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level + - endpoint_server_cmaui_4_test_nested4Level_test_nested3Level network.outpoing.packets_cmaui_port_1: - abstract_cmaui_2 - network.outpoing.packets_cmaui_cmaui_port_1 network.outpoing.packets_cmaui_port_2: - abstract_cmaui_2 - network.outpoing.packets_cmaui_cmaui_port_2 + disk.device.read.requests_server_cmaui_1: + - abstract_cmaui_2 + - disk.device.read.requests_cmaui + cpu.delta_server_cmaui_1: + - abstract_cmaui_2 + - cpu.delta_cmaui attachment_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - attachment_cmaui_port_7_test_nested4Level_test_nested3Level - disk.ephemeral.size_server_cmaui_test_nested2Level: - - test_nested2Level - - disk.ephemeral.size_server_cmaui - disk.device.read.bytes_server_cmaui_test_nested3Level_test_nested2Level: - - test_nested2Level - - disk.device.read.bytes_server_cmaui_test_nested3Level - disk.device.allocation_server_cmaui_test_nested2Level: - - test_nested2Level - - disk.device.allocation_server_cmaui - disk.device.iops_server_cmaui_test_nested2Level: - - test_nested2Level - - disk.device.iops_server_cmaui - binding_server_cmaui_test_nested2Level: + disk.device.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - binding_server_cmaui + - disk.device.read.bytes_server_cmaui_3_test_nested3Level network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level - disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + disk.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level - memory.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + - disk.write.bytes.rate_server_cmaui_3_test_nested3Level + disk.device.allocation_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - memory.usage_server_cmaui_test_nested4Level_test_nested3Level - cpu.delta_server_cmaui: - - abstract_cmaui_2 - - cpu.delta_cmaui + - disk.device.allocation_server_cmaui_3_test_nested3Level feature_cmaui_port_5_test_nested3Level_test_nested2Level: - test_nested2Level - feature_cmaui_port_5_test_nested3Level - disk.device.capacity_server_cmaui_test_nested2Level: + cpu_util_server_cmaui_2_test_nested2Level: - test_nested2Level - - disk.device.capacity_server_cmaui + - cpu_util_server_cmaui_2 attachment_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - attachment_cmaui_port_8_test_nested4Level_test_nested3Level - disk.write.requests_server_cmaui_test_nested2Level: + memory.usage_server_cmaui_2_test_nested2Level: - test_nested2Level - - disk.write.requests_server_cmaui - scalable_server_cmaui: - - abstract_cmaui_2 - - scalable_cmaui - disk.read.bytes.rate_server_cmaui: + - memory.usage_server_cmaui_2 + disk.device.usage_server_cmaui_1: - abstract_cmaui_2 - - disk.read.bytes.rate_cmaui - disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + - disk.device.usage_cmaui + disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - - disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level - scalable_server_cmaui_test_nested3Level_test_nested2Level: + - disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level + feature_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - scalable_server_cmaui_test_nested3Level - disk.read.bytes_server_cmaui_test_nested2Level: + - feature_server_cmaui_3_test_nested3Level + disk.device.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - disk.read.bytes_server_cmaui - disk.device.latency_server_cmaui_test_nested3Level_test_nested2Level: + - disk.device.read.requests_server_cmaui_3_test_nested3Level + disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - - disk.device.latency_server_cmaui_test_nested3Level - cpu.delta_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + - disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level + disk.device.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - cpu.delta_server_cmaui_test_nested4Level_test_nested3Level + - disk.device.write.requests.rate_server_cmaui_3_test_nested3Level network.outgoing.bytes_cmaui_port_3_test_nested2Level: - test_nested2Level - network.outgoing.bytes_cmaui_port_3 - disk.usage_server_cmaui_test_nested3Level_test_nested2Level: - - test_nested2Level - - disk.usage_server_cmaui_test_nested3Level - cpu_util_server_cmaui: + disk.device.write.requests.rate_server_cmaui_1: - abstract_cmaui_2 - - cpu_util_cmaui - disk.device.write.requests_server_cmaui: - - abstract_cmaui_2 - - disk.device.write.requests_cmaui - disk.write.requests.rate_server_cmaui_test_nested3Level_test_nested2Level: + - disk.device.write.requests.rate_cmaui + disk.read.requests_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.read.requests_server_cmaui_2 + feature_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - - disk.write.requests.rate_server_cmaui_test_nested3Level - disk.capacity_server_cmaui_test_nested2Level: + - feature_server_cmaui_4_test_nested4Level_test_nested3Level + disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - - disk.capacity_server_cmaui - disk.device.write.bytes.rate_server_cmaui_test_nested2Level: + - disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level + disk.write.bytes.rate_server_cmaui_2_test_nested2Level: - test_nested2Level - - disk.device.write.bytes.rate_server_cmaui + - disk.write.bytes.rate_server_cmaui_2 + disk.latency_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.latency_server_cmaui_2 + vcpus_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - vcpus_server_cmaui_3_test_nested3Level + disk.device.iops_server_cmaui_1: + - abstract_cmaui_2 + - disk.device.iops_cmaui network.outgoing.bytes_cmaui_port_4_test_nested2Level: - test_nested2Level - network.outgoing.bytes_cmaui_port_4 - disk.device.usage_server_cmaui_test_nested2Level: + disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - - disk.device.usage_server_cmaui - disk.read.requests_server_cmaui_test_nested3Level_test_nested2Level: + - disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level + disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - - disk.read.requests_server_cmaui_test_nested3Level - disk.device.read.bytes_server_cmaui: - - abstract_cmaui_2 - - disk.device.read.bytes_cmaui + - disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level network.incoming.packets_cmaui_port_5_test_nested3Level_test_nested2Level: - test_nested2Level - network.incoming.packets_cmaui_port_5_test_nested3Level - cpu_util_server_cmaui_test_nested3Level_test_nested2Level: + disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - - cpu_util_server_cmaui_test_nested3Level - disk.root.size_server_cmaui: - - abstract_cmaui_2 - - disk.root.size_cmaui - disk.latency_server_cmaui_test_nested3Level_test_nested2Level: + - disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level + disk.device.write.bytes.rate_server_cmaui_2_test_nested2Level: - test_nested2Level - - disk.latency_server_cmaui_test_nested3Level - disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + - disk.device.write.bytes.rate_server_cmaui_2 + disk.device.read.requests_server_cmaui_2_test_nested2Level: - test_nested2Level - - disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level - vcpus_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + - disk.device.read.requests_server_cmaui_2 + cpu_server_cmaui_1: + - abstract_cmaui_2 + - cpu_cmaui + memory.resident_server_cmaui_2_test_nested2Level: - test_nested2Level - - vcpus_server_cmaui_test_nested4Level_test_nested3Level - disk.capacity_server_cmaui_test_nested3Level_test_nested2Level: + - memory.resident_server_cmaui_2 + disk.device.iops_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - disk.capacity_server_cmaui_test_nested3Level - disk.device.write.requests.rate_server_cmaui_test_nested2Level: + - disk.device.iops_server_cmaui_3_test_nested3Level + disk.allocation_server_cmaui_2_test_nested2Level: - test_nested2Level - - disk.device.write.requests.rate_server_cmaui + - disk.allocation_server_cmaui_2 network.incoming.packets_cmaui_port_2: - abstract_cmaui_2 - network.incoming.packets_cmaui_cmaui_port_2 - disk.device.write.bytes.rate_server_cmaui: - - abstract_cmaui_2 - - disk.device.write.bytes.rate_cmaui - disk.device.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: - - test_nested2Level - - disk.device.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level network.outgoing.packets.rate_cmaui_port_6_test_nested3Level_test_nested2Level: - test_nested2Level - network.outgoing.packets.rate_cmaui_port_6_test_nested3Level network.incoming.packets_cmaui_port_1: - abstract_cmaui_2 - network.incoming.packets_cmaui_cmaui_port_1 - disk.device.read.bytes_server_cmaui_test_nested2Level: + memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: + - test_nested2Level + - memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level + disk.device.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.device.write.requests_server_cmaui_3_test_nested3Level + disk.write.requests_server_cmaui_2_test_nested2Level: - test_nested2Level - - disk.device.read.bytes_server_cmaui - disk.device.write.requests.rate_server_cmaui_test_nested3Level_test_nested2Level: + - disk.write.requests_server_cmaui_2 + disk.capacity_server_cmaui_1: + - abstract_cmaui_2 + - disk.capacity_cmaui + disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - - disk.device.write.requests.rate_server_cmaui_test_nested3Level - cpu_util_server_cmaui_test_nested2Level: + - disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level + disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - - cpu_util_server_cmaui + - disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level + scalable_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: + - test_nested2Level + - scalable_server_cmaui_4_test_nested4Level_test_nested3Level network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level network.outpoing.packets_cmaui_port_3_test_nested2Level: - test_nested2Level - network.outpoing.packets_cmaui_port_3 - disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: - - test_nested2Level - - disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level - disk.device.write.bytes_server_cmaui_test_nested3Level_test_nested2Level: - - test_nested2Level - - disk.device.write.bytes_server_cmaui_test_nested3Level - host_server_cmaui_test_nested2Level: - - test_nested2Level - - host_server_cmaui network.incoming.packets_cmaui_port_6_test_nested3Level_test_nested2Level: - test_nested2Level - network.incoming.packets_cmaui_port_6_test_nested3Level - memory_server_cmaui_test_nested3Level_test_nested2Level: - - test_nested2Level - - memory_server_cmaui_test_nested3Level binding_cmaui_port_4_test_nested2Level: - test_nested2Level - binding_cmaui_port_4 - disk.device.read.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level: + disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level + disk.device.read.bytes.rate_server_cmaui_2_test_nested2Level: - test_nested2Level - - disk.device.read.bytes.rate_server_cmaui_test_nested3Level + - disk.device.read.bytes.rate_server_cmaui_2 network.incoming.packets.rate_cmaui_port_4_test_nested2Level: - test_nested2Level - network.incoming.packets.rate_cmaui_port_4 feature_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - feature_test_nested4Level_test_nested3Level - disk.latency_server_cmaui_test_nested2Level: - - test_nested2Level - - disk.latency_server_cmaui - disk.device.write.requests_server_cmaui_test_nested3Level_test_nested2Level: - - test_nested2Level - - disk.device.write.requests_server_cmaui_test_nested3Level - vcpus_server_cmaui_test_nested2Level: + disk.iops_server_cmaui_1: + - abstract_cmaui_2 + - disk.iops_cmaui + disk.device.usage_server_cmaui_2_test_nested2Level: - test_nested2Level - - vcpus_server_cmaui + - disk.device.usage_server_cmaui_2 feature_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - feature_cmaui_port_8_test_nested4Level_test_nested3Level - disk.device.write.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level: + cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: + - test_nested2Level + - cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level + disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - disk.device.write.bytes.rate_server_cmaui_test_nested3Level + - disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level network.outgoing.bytes.rate_cmaui_port_2: - abstract_cmaui_2 - network.outgoing.bytes.rate_cmaui_cmaui_port_2 - disk.iops_server_cmaui_test_nested2Level: - - test_nested2Level - - disk.iops_server_cmaui network.outgoing.bytes.rate_cmaui_port_1: - abstract_cmaui_2 - network.outgoing.bytes.rate_cmaui_cmaui_port_1 attachment_cmaui_port_4_test_nested2Level: - test_nested2Level - attachment_cmaui_port_4 - memory.usage_server_cmaui_test_nested2Level: - - test_nested2Level - - memory.usage_server_cmaui - disk.iops_server_cmaui: - - abstract_cmaui_2 - - disk.iops_cmaui network.outgoing.packets.rate_cmaui_port_5_test_nested3Level_test_nested2Level: - test_nested2Level - network.outgoing.packets.rate_cmaui_port_5_test_nested3Level network.outgoing.bytes.rate_cmaui_port_4_test_nested2Level: - test_nested2Level - network.outgoing.bytes.rate_cmaui_port_4 - disk.read.bytes_server_cmaui: - - abstract_cmaui_2 - - disk.read.bytes_cmaui - disk.read.requests_server_cmaui_test_nested2Level: + endpoint_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - disk.read.requests_server_cmaui - feature_server_cmaui_test_nested3Level_test_nested2Level: + - endpoint_server_cmaui_3_test_nested3Level + binding_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - feature_server_cmaui_test_nested3Level - memory_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + - binding_server_cmaui_3_test_nested3Level + disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - - memory_server_cmaui_test_nested4Level_test_nested3Level - cpu_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + - disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level + disk.iops_server_cmaui_2_test_nested2Level: - test_nested2Level - - cpu_server_cmaui_test_nested4Level_test_nested3Level - disk.write.bytes.rate_server_cmaui: + - disk.iops_server_cmaui_2 + disk.write.bytes_server_cmaui_1: - abstract_cmaui_2 - - disk.write.bytes.rate_cmaui - disk.iops_server_cmaui_test_nested3Level_test_nested2Level: - - test_nested2Level - - disk.iops_server_cmaui_test_nested3Level - disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + - disk.write.bytes_cmaui + feature_server_cmaui_1: + - abstract_cmaui_2 + - feature_cmaui + disk.allocation_server_cmaui_1: + - abstract_cmaui_2 + - disk.allocation_cmaui + disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - - disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level + - disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level - disk.device.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: - - test_nested2Level - - disk.device.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level attachment_cmaui_port_2: - abstract_cmaui_2 - attachment_cmaui_cmaui_port_2 - disk.device.capacity_server_cmaui: - - abstract_cmaui_2 - - disk.device.capacity_cmaui + instance_server_cmaui_2_test_nested2Level: + - test_nested2Level + - instance_server_cmaui_2 network.outgoing.packets.rate_cmaui_port_1: - abstract_cmaui_2 - network.outgoing.packets.rate_cmaui_cmaui_port_1 @@ -783,39 +732,51 @@ topology_template: network.incoming.packets.rate_cmaui_port_3_test_nested2Level: - test_nested2Level - network.incoming.packets.rate_cmaui_port_3 + disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level attachment_cmaui_port_1: - abstract_cmaui_2 - attachment_cmaui_cmaui_port_1 - disk.device.write.bytes_server_cmaui_test_nested2Level: - - test_nested2Level - - disk.device.write.bytes_server_cmaui network.outgoing.packets.rate_cmaui_port_3_test_nested2Level: - test_nested2Level - network.outgoing.packets.rate_cmaui_port_3 network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level - disk.device.read.requests_server_cmaui_test_nested3Level_test_nested2Level: + disk.write.requests_server_cmaui_1: + - abstract_cmaui_2 + - disk.write.requests_cmaui + disk.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - disk.device.read.requests_server_cmaui_test_nested3Level + - disk.read.bytes_server_cmaui_3_test_nested3Level + cpu.delta_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - cpu.delta_server_cmaui_3_test_nested3Level + disk.usage_server_cmaui_1: + - abstract_cmaui_2 + - disk.usage_cmaui network.incoming.bytes_cmaui_port_6_test_nested3Level_test_nested2Level: - test_nested2Level - network.incoming.bytes_cmaui_port_6_test_nested3Level - disk.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + memory_server_cmaui_2_test_nested2Level: + - test_nested2Level + - memory_server_cmaui_2 + disk.usage_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - disk.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level - disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + - disk.usage_server_cmaui_3_test_nested3Level + disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - - disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level - memory_server_cmaui: + - disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level + os_server_cmaui_1: - abstract_cmaui_2 - - memory_cmaui - scalable_server_cmaui_test_nested2Level: + - os_cmaui + disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - - scalable_server_cmaui - disk.usage_server_cmaui_test_nested2Level: + - disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level + disk.root.size_server_cmaui_2_test_nested2Level: - test_nested2Level - - disk.usage_server_cmaui + - disk.root.size_server_cmaui_2 feature_cmaui_port_4_test_nested2Level: - test_nested2Level - feature_cmaui_port_4 @@ -825,51 +786,72 @@ topology_template: attachment_cmaui_port_5_test_nested3Level_test_nested2Level: - test_nested2Level - attachment_cmaui_port_5_test_nested3Level - disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + cpu_util_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - cpu_util_server_cmaui_3_test_nested3Level + disk.device.latency_server_cmaui_2_test_nested2Level: - test_nested2Level - - disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level - disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + - disk.device.latency_server_cmaui_2 + disk.allocation_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level - memory.resident_server_cmaui_test_nested2Level: + - disk.allocation_server_cmaui_3_test_nested3Level + disk.ephemeral.size_server_cmaui_2_test_nested2Level: - test_nested2Level - - memory.resident_server_cmaui + - disk.ephemeral.size_server_cmaui_2 + disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level - host_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + host_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: + - test_nested2Level + - host_server_cmaui_4_test_nested4Level_test_nested3Level + disk.capacity_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - host_server_cmaui_test_nested4Level_test_nested3Level + - disk.capacity_server_cmaui_3_test_nested3Level + host_server_cmaui_1: + - abstract_cmaui_2 + - host_cmaui feature_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - feature_cmaui_port_7_test_nested4Level_test_nested3Level - host_server_cmaui_test_nested3Level_test_nested2Level: + binding_server_cmaui_2_test_nested2Level: - test_nested2Level - - host_server_cmaui_test_nested3Level + - binding_server_cmaui_2 + cpu.delta_server_cmaui_2_test_nested2Level: + - test_nested2Level + - cpu.delta_server_cmaui_2 network.outpoing.packets_cmaui_port_4_test_nested2Level: - test_nested2Level - network.outpoing.packets_cmaui_port_4 binding_cmaui_port_3_test_nested2Level: - test_nested2Level - binding_cmaui_port_3 - disk.device.write.requests_server_cmaui_test_nested2Level: + disk.device.capacity_server_cmaui_2_test_nested2Level: - test_nested2Level - - disk.device.write.requests_server_cmaui - memory.resident_server_cmaui: - - abstract_cmaui_2 - - memory.resident_cmaui - disk.read.bytes.rate_server_cmaui_test_nested2Level: + - disk.device.capacity_server_cmaui_2 + disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - - disk.read.bytes.rate_server_cmaui - disk.latency_server_cmaui: - - abstract_cmaui_2 - - disk.latency_cmaui - disk.allocation_server_cmaui_test_nested2Level: + - disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level + memory.usage_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - memory.usage_server_cmaui_3_test_nested3Level + scalable_server_cmaui_2_test_nested2Level: + - test_nested2Level + - scalable_server_cmaui_2 + host_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - host_server_cmaui_3_test_nested3Level + disk.iops_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - disk.allocation_server_cmaui - disk.allocation_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + - disk.iops_server_cmaui_3_test_nested3Level + vcpus_server_cmaui_2_test_nested2Level: - test_nested2Level - - disk.allocation_server_cmaui_test_nested4Level_test_nested3Level + - vcpus_server_cmaui_2 + disk.device.read.requests.rate_server_cmaui_1: + - abstract_cmaui_2 + - disk.device.read.requests.rate_cmaui network.outgoing.bytes_cmaui_port_6_test_nested3Level_test_nested2Level: - test_nested2Level - network.outgoing.bytes_cmaui_port_6_test_nested3Level @@ -879,40 +861,58 @@ topology_template: network.incoming.bytes.rate_cmaui_port_2: - abstract_cmaui_2 - network.incoming.bytes.rate_cmaui_cmaui_port_2 - disk.write.requests_server_cmaui: + disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level + vcpus_server_cmaui_1: - abstract_cmaui_2 - - disk.write.requests_cmaui - cpu.delta_server_cmaui_test_nested2Level: + - vcpus_cmaui + disk.write.requests.rate_server_cmaui_2_test_nested2Level: - test_nested2Level - - cpu.delta_server_cmaui + - disk.write.requests.rate_server_cmaui_2 + disk.write.bytes_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.write.bytes_server_cmaui_2 feature_test_nested3Level_test_nested2Level: - test_nested2Level - feature_test_nested3Level feature_cmaui_port_6_test_nested3Level_test_nested2Level: - test_nested2Level - feature_cmaui_port_6_test_nested3Level + disk.device.usage_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.device.usage_server_cmaui_3_test_nested3Level + disk.read.bytes.rate_server_cmaui_1: + - abstract_cmaui_2 + - disk.read.bytes.rate_cmaui network.outgoing.bytes.rate_cmaui_port_3_test_nested2Level: - test_nested2Level - network.outgoing.bytes.rate_cmaui_port_3 - memory.resident_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + disk.device.capacity_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - memory.resident_server_cmaui_test_nested4Level_test_nested3Level + - disk.device.capacity_server_cmaui_3_test_nested3Level network.incoming.bytes.rate_cmaui_port_3_test_nested2Level: - test_nested2Level - network.incoming.bytes.rate_cmaui_port_3 - endpoint_server_cmaui: + memory.resident_server_cmaui_1: - abstract_cmaui_2 - - endpoint_cmaui - disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + - memory.resident_cmaui + disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - - disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level - disk.allocation_server_cmaui_test_nested3Level_test_nested2Level: + - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level + disk.latency_server_cmaui_1: + - abstract_cmaui_2 + - disk.latency_cmaui + host_server_cmaui_2_test_nested2Level: - test_nested2Level - - disk.allocation_server_cmaui_test_nested3Level - requirements: - dependency_server_cmaui: + - host_server_cmaui_2 + memory.usage_server_cmaui_1: - abstract_cmaui_2 - - dependency_cmaui + - memory.usage_cmaui + requirements: + local_storage_server_cmaui_2_test_nested2Level: + - test_nested2Level + - local_storage_server_cmaui_2 link_cmaui_port_5_test_nested3Level_test_nested2Level: - test_nested2Level - link_cmaui_port_5_test_nested3Level @@ -937,42 +937,42 @@ topology_template: link_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - link_cmaui_port_7_test_nested4Level_test_nested3Level - dependency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: - - test_nested2Level - - dependency_server_cmaui_test_nested4Level_test_nested3Level dependency_cmaui_port_3_test_nested2Level: - test_nested2Level - dependency_cmaui_port_3 + dependency_server_cmaui_2_test_nested2Level: + - test_nested2Level + - dependency_server_cmaui_2 + local_storage_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - local_storage_server_cmaui_3_test_nested3Level dependency_cmaui_port_1: - abstract_cmaui_2 - dependency_cmaui_cmaui_port_1 + dependency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: + - test_nested2Level + - dependency_server_cmaui_4_test_nested4Level_test_nested3Level link_cmaui_port_6_test_nested3Level_test_nested2Level: - test_nested2Level - link_cmaui_port_6_test_nested3Level - dependency_server_cmaui_test_nested2Level: - - test_nested2Level - - dependency_server_cmaui dependency_cmaui_port_2: - abstract_cmaui_2 - dependency_cmaui_cmaui_port_2 link_cmaui_port_4_test_nested2Level: - test_nested2Level - link_cmaui_port_4 - dependency_cmaui_port_5_test_nested3Level_test_nested2Level: + local_storage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - - dependency_cmaui_port_5_test_nested3Level - local_storage_server_cmaui: + - local_storage_server_cmaui_4_test_nested4Level_test_nested3Level + dependency_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - dependency_server_cmaui_3_test_nested3Level + local_storage_server_cmaui_1: - abstract_cmaui_2 - local_storage_cmaui - local_storage_server_cmaui_test_nested2Level: - - test_nested2Level - - local_storage_server_cmaui - dependency_server_cmaui_test_nested3Level_test_nested2Level: - - test_nested2Level - - dependency_server_cmaui_test_nested3Level - local_storage_server_cmaui_test_nested3Level_test_nested2Level: + dependency_cmaui_port_5_test_nested3Level_test_nested2Level: - test_nested2Level - - local_storage_server_cmaui_test_nested3Level + - dependency_cmaui_port_5_test_nested3Level link_cmaui_port_3_test_nested2Level: - test_nested2Level - link_cmaui_port_3 @@ -985,9 +985,9 @@ topology_template: dependency_test_nested3Level_test_nested2Level: - test_nested2Level - dependency_test_nested3Level - local_storage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: - - test_nested2Level - - local_storage_server_cmaui_test_nested4Level_test_nested3Level + dependency_server_cmaui_1: + - abstract_cmaui_2 + - dependency_cmaui dependency_cmaui_port_4_test_nested2Level: - test_nested2Level - - dependency_cmaui_port_4 + - dependency_cmaui_port_4
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml index c3425ca981..33ae55e5cd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml @@ -151,504 +151,489 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested2 capabilities: - cpu.delta_server_cmaui: - - abstract_cmaui_1 - - cpu.delta_cmaui - disk.device.write.requests.rate_server_cmaui: - - abstract_cmaui_1 - - disk.device.write.requests.rate_cmaui - disk.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level: + instance_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - - disk.write.bytes.rate_server_cmaui_test_nested4Level - vcpus_server_cmaui_test_nested3Level: - - test_nested3Level - - vcpus_server_cmaui - disk.device.allocation_server_cmaui: - - abstract_cmaui_1 - - disk.device.allocation_cmaui - disk.latency_server_cmaui_test_nested3Level: + - instance_server_cmaui_4_test_nested4Level + memory.usage_server_cmaui_3_test_nested3Level: - test_nested3Level - - disk.latency_server_cmaui - disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level: + - memory.usage_server_cmaui_3 + cpu_util_server_cmaui_3_test_nested3Level: - test_nested3Level - - disk.device.capacity_server_cmaui_test_nested4Level - scalable_server_cmaui: + - cpu_util_server_cmaui_3 + disk.device.usage_server_cmaui_2: - abstract_cmaui_1 - - scalable_cmaui - disk.read.bytes.rate_server_cmaui: - - abstract_cmaui_1 - - disk.read.bytes.rate_cmaui - memory.resident_server_cmaui_test_nested4Level_test_nested3Level: + - disk.device.usage_cmaui + disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - - memory.resident_server_cmaui_test_nested4Level + - disk.device.usage_server_cmaui_4_test_nested4Level + disk.device.latency_server_cmaui_2: + - abstract_cmaui_1 + - disk.device.latency_cmaui network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level: - test_nested3Level - network.incoming.bytes_cmaui_port_7_test_nested4Level - disk.capacity_server_cmaui_test_nested4Level_test_nested3Level: + disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - - disk.capacity_server_cmaui_test_nested4Level - host_server_cmaui: + - disk.usage_server_cmaui_4_test_nested4Level + disk.root.size_server_cmaui_2: - abstract_cmaui_1 - - host_cmaui - cpu_util_server_cmaui: + - disk.root.size_cmaui + disk.device.write.requests.rate_server_cmaui_2: - abstract_cmaui_1 - - cpu_util_cmaui - os_server_cmaui_test_nested3Level: - - test_nested3Level - - os_server_cmaui - disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level: + - disk.device.write.requests.rate_cmaui + disk.read.requests_server_cmaui_3_test_nested3Level: - test_nested3Level - - disk.device.read.bytes_server_cmaui_test_nested4Level - disk.device.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level: + - disk.read.requests_server_cmaui_3 + disk.latency_server_cmaui_3_test_nested3Level: - test_nested3Level - - disk.device.read.bytes.rate_server_cmaui_test_nested4Level - memory.usage_server_cmaui_test_nested4Level_test_nested3Level: + - disk.latency_server_cmaui_3 + disk.write.bytes.rate_server_cmaui_3_test_nested3Level: - test_nested3Level - - memory.usage_server_cmaui_test_nested4Level + - disk.write.bytes.rate_server_cmaui_3 network.outgoing.bytes_cmaui_port_3: - abstract_cmaui_1 - network.outgoing.bytes_cmaui_cmaui_port_3 - disk.device.write.requests_server_cmaui: + endpoint_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - endpoint_server_cmaui_4_test_nested4Level + disk.read.requests_server_cmaui_2: - abstract_cmaui_1 - - disk.device.write.requests_cmaui - instance_server_cmaui_test_nested4Level_test_nested3Level: + - disk.read.requests_cmaui + cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - - instance_server_cmaui_test_nested4Level - disk.device.capacity_server_cmaui_test_nested3Level: + - cpu_util_server_cmaui_4_test_nested4Level + disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - - disk.device.capacity_server_cmaui + - disk.write.bytes.rate_server_cmaui_4_test_nested4Level feature_test_nested4Level_test_nested3Level: - test_nested3Level - feature_test_nested4Level - disk.read.bytes_server_cmaui_test_nested3Level: - - test_nested3Level - - disk.read.bytes_server_cmaui - disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level: - - test_nested3Level - - disk.device.write.bytes.rate_server_cmaui_test_nested4Level network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level: - test_nested3Level - network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level - feature_server_cmaui_test_nested3Level: + disk.device.iops_server_cmaui_2: + - abstract_cmaui_1 + - disk.device.iops_cmaui + disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - - feature_server_cmaui + - disk.device.write.bytes_server_cmaui_4_test_nested4Level + disk.device.capacity_server_cmaui_2: + - abstract_cmaui_1 + - disk.device.capacity_cmaui attachment_cmaui_port_7_test_nested4Level_test_nested3Level: - test_nested3Level - attachment_cmaui_port_7_test_nested4Level - memory.usage_server_cmaui_test_nested3Level: + host_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - - memory.usage_server_cmaui - instance_server_cmaui: + - host_server_cmaui_4_test_nested4Level + disk.device.read.bytes.rate_server_cmaui_2: - abstract_cmaui_1 - - instance_cmaui - disk.device.read.bytes_server_cmaui: + - disk.device.read.bytes.rate_cmaui + disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - disk.ephemeral.size_server_cmaui_4_test_nested4Level + disk.read.bytes_server_cmaui_2: + - abstract_cmaui_1 + - disk.read.bytes_cmaui + disk.device.read.bytes_server_cmaui_2: - abstract_cmaui_1 - disk.device.read.bytes_cmaui - binding_server_cmaui_test_nested3Level: + disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - - binding_server_cmaui - disk.root.size_server_cmaui: + - disk.device.capacity_server_cmaui_4_test_nested4Level + disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - disk.root.size_server_cmaui_4_test_nested4Level + disk.write.requests.rate_server_cmaui_2: - abstract_cmaui_1 - - disk.root.size_cmaui - memory_server_cmaui_test_nested3Level: + - disk.write.requests.rate_cmaui + disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - - memory_server_cmaui + - disk.iops_server_cmaui_4_test_nested4Level network.outgoing.bytes.rate_cmaui_port_5_test_nested3Level: - test_nested3Level - network.outgoing.bytes.rate_cmaui_port_5 - network.incoming.packets_cmaui_port_3: + memory_server_cmaui_2: - abstract_cmaui_1 - - network.incoming.packets_cmaui_cmaui_port_3 - os_server_cmaui: + - memory_cmaui + cpu_server_cmaui_2: - abstract_cmaui_1 - - os_cmaui - disk.device.write.bytes.rate_server_cmaui: + - cpu_cmaui + host_server_cmaui_3_test_nested3Level: + - test_nested3Level + - host_server_cmaui_3 + network.incoming.packets_cmaui_port_3: - abstract_cmaui_1 - - disk.device.write.bytes.rate_cmaui + - network.incoming.packets_cmaui_cmaui_port_3 + disk.allocation_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.allocation_server_cmaui_3 + memory_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - memory_server_cmaui_4_test_nested4Level network.incoming.packets_cmaui_port_4: - abstract_cmaui_1 - network.incoming.packets_cmaui_cmaui_port_4 - disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level: - - test_nested3Level - - disk.device.latency_server_cmaui_test_nested4Level network.outgoing.bytes_cmaui_port_6_test_nested3Level: - test_nested3Level - network.outgoing.bytes_cmaui_port_6 network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level: - test_nested3Level - network.outgoing.bytes_cmaui_port_7_test_nested4Level - disk.ephemeral.size_server_cmaui_test_nested3Level: - - test_nested3Level - - disk.ephemeral.size_server_cmaui network.incoming.packets.rate_cmaui_port_6_test_nested3Level: - test_nested3Level - network.incoming.packets.rate_cmaui_port_6 - disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level: + disk.ephemeral.size_server_cmaui_2: + - abstract_cmaui_1 + - disk.ephemeral.size_cmaui + cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - cpu.delta_server_cmaui_4_test_nested4Level + disk.write.requests_server_cmaui_3_test_nested3Level: - test_nested3Level - - disk.write.requests.rate_server_cmaui_test_nested4Level + - disk.write.requests_server_cmaui_3 network.outpoing.packets_cmaui_port_5_test_nested3Level: - test_nested3Level - network.outpoing.packets_cmaui_port_5 - vcpus_server_cmaui_test_nested4Level_test_nested3Level: - - test_nested3Level - - vcpus_server_cmaui_test_nested4Level + disk.capacity_server_cmaui_2: + - abstract_cmaui_1 + - disk.capacity_cmaui network.incoming.packets_cmaui_port_6_test_nested3Level: - test_nested3Level - network.incoming.packets_cmaui_port_6 - cpu_util_server_cmaui_test_nested3Level: - - test_nested3Level - - cpu_util_server_cmaui network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level: - test_nested3Level - network.incoming.bytes_cmaui_port_8_test_nested4Level - endpoint_server_cmaui_test_nested4Level_test_nested3Level: - - test_nested3Level - - endpoint_server_cmaui_test_nested4Level network.outgoing.bytes.rate_cmaui_port_6_test_nested3Level: - test_nested3Level - network.outgoing.bytes.rate_cmaui_port_6 - disk.allocation_server_cmaui_test_nested3Level: - - test_nested3Level - - disk.allocation_server_cmaui - memory.resident_server_cmaui_test_nested3Level: - - test_nested3Level - - memory.resident_server_cmaui - disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level: - - test_nested3Level - - disk.ephemeral.size_server_cmaui_test_nested4Level - cpu.delta_server_cmaui_test_nested3Level: + disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - - cpu.delta_server_cmaui - disk.device.read.bytes_server_cmaui_test_nested3Level: + - disk.read.bytes.rate_server_cmaui_4_test_nested4Level + disk.read.bytes.rate_server_cmaui_3_test_nested3Level: - test_nested3Level - - disk.device.read.bytes_server_cmaui - disk.device.read.requests_server_cmaui_test_nested3Level: + - disk.read.bytes.rate_server_cmaui_3 + disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - - disk.device.read.requests_server_cmaui - disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level: - - test_nested3Level - - disk.write.requests_server_cmaui_test_nested4Level - feature_server_cmaui: - - abstract_cmaui_1 - - feature_cmaui + - disk.device.iops_server_cmaui_4_test_nested4Level binding_cmaui_port_3: - abstract_cmaui_1 - binding_cmaui_cmaui_port_3 - disk.device.read.bytes.rate_server_cmaui_test_nested3Level: - - test_nested3Level - - disk.device.read.bytes.rate_server_cmaui + disk.iops_server_cmaui_2: + - abstract_cmaui_1 + - disk.iops_cmaui binding_cmaui_port_4: - abstract_cmaui_1 - binding_cmaui_cmaui_port_4 - disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level: - - test_nested3Level - - disk.device.write.requests_server_cmaui_test_nested4Level - endpoint_server_cmaui_test_nested3Level: - - test_nested3Level - - endpoint_server_cmaui - disk.device.write.requests_server_cmaui_test_nested3Level: - - test_nested3Level - - disk.device.write.requests_server_cmaui - memory.usage_server_cmaui: + disk.device.write.requests_server_cmaui_2: - abstract_cmaui_1 - - memory.usage_cmaui + - disk.device.write.requests_cmaui feature_cmaui_port_6_test_nested3Level: - test_nested3Level - feature_cmaui_port_6 feature_cmaui_port_8_test_nested4Level_test_nested3Level: - test_nested3Level - feature_cmaui_port_8_test_nested4Level - disk.ephemeral.size_server_cmaui: - - abstract_cmaui_1 - - disk.ephemeral.size_cmaui + memory_server_cmaui_3_test_nested3Level: + - test_nested3Level + - memory_server_cmaui_3 network.incoming.bytes.rate_cmaui_port_6_test_nested3Level: - test_nested3Level - network.incoming.bytes.rate_cmaui_port_6 - memory_server_cmaui_test_nested4Level_test_nested3Level: + feature_server_cmaui_3_test_nested3Level: - test_nested3Level - - memory_server_cmaui_test_nested4Level + - feature_server_cmaui_3 network.outgoing.bytes.rate_cmaui_port_3: - abstract_cmaui_1 - network.outgoing.bytes.rate_cmaui_cmaui_port_3 - disk.device.usage_server_cmaui_test_nested3Level: + disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level: - test_nested3Level - - disk.device.usage_server_cmaui + - disk.device.write.bytes.rate_server_cmaui_3 + disk.root.size_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.root.size_server_cmaui_3 network.outgoing.bytes.rate_cmaui_port_4: - abstract_cmaui_1 - network.outgoing.bytes.rate_cmaui_cmaui_port_4 binding_cmaui_port_6_test_nested3Level: - test_nested3Level - binding_cmaui_port_6 - disk.iops_server_cmaui: - - abstract_cmaui_1 - - disk.iops_cmaui + disk.usage_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.usage_server_cmaui_3 + os_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - os_server_cmaui_4_test_nested4Level + disk.device.write.requests_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.write.requests_server_cmaui_3 network.incoming.bytes_cmaui_port_4: - abstract_cmaui_1 - network.incoming.bytes_cmaui_cmaui_port_4 - disk.iops_server_cmaui_test_nested4Level_test_nested3Level: - - test_nested3Level - - disk.iops_server_cmaui_test_nested4Level network.incoming.bytes_cmaui_port_3: - abstract_cmaui_1 - network.incoming.bytes_cmaui_cmaui_port_3 - disk.device.iops_server_cmaui: - - abstract_cmaui_1 - - disk.device.iops_cmaui - disk.read.bytes_server_cmaui: + disk.device.read.requests.rate_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.read.requests.rate_server_cmaui_3 + disk.device.latency_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.latency_server_cmaui_3 + cpu_util_server_cmaui_2: - abstract_cmaui_1 - - disk.read.bytes_cmaui - disk.root.size_server_cmaui_test_nested3Level: + - cpu_util_cmaui + memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - memory.usage_server_cmaui_4_test_nested4Level + disk.device.write.requests.rate_server_cmaui_3_test_nested3Level: - test_nested3Level - - disk.root.size_server_cmaui + - disk.device.write.requests.rate_server_cmaui_3 network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level: - test_nested3Level - network.outgoing.bytes_cmaui_port_8_test_nested4Level + disk.device.write.bytes.rate_server_cmaui_2: + - abstract_cmaui_1 + - disk.device.write.bytes.rate_cmaui + disk.write.bytes.rate_server_cmaui_2: + - abstract_cmaui_1 + - disk.write.bytes.rate_cmaui + disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level + vcpus_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - vcpus_server_cmaui_4_test_nested4Level network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level: - test_nested3Level - network.outpoing.packets_cmaui_port_8_test_nested4Level - cpu_server_cmaui_test_nested4Level_test_nested3Level: - - test_nested3Level - - cpu_server_cmaui_test_nested4Level + disk.device.write.bytes_server_cmaui_2: + - abstract_cmaui_1 + - disk.device.write.bytes_cmaui feature_cmaui_port_7_test_nested4Level_test_nested3Level: - test_nested3Level - feature_cmaui_port_7_test_nested4Level - cpu_server_cmaui: - - abstract_cmaui_1 - - cpu_cmaui + disk.iops_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.iops_server_cmaui_3 network.incoming.packets.rate_cmaui_port_3: - abstract_cmaui_1 - network.incoming.packets.rate_cmaui_cmaui_port_3 + cpu_server_cmaui_3_test_nested3Level: + - test_nested3Level + - cpu_server_cmaui_3 feature_cmaui_port_3: - abstract_cmaui_1 - feature_cmaui_cmaui_port_3 + disk.write.bytes_server_cmaui_2: + - abstract_cmaui_1 + - disk.write.bytes_cmaui network.incoming.packets.rate_cmaui_port_4: - abstract_cmaui_1 - network.incoming.packets.rate_cmaui_cmaui_port_4 + feature_server_cmaui_2: + - abstract_cmaui_1 + - feature_cmaui feature_cmaui_port_4: - abstract_cmaui_1 - feature_cmaui_cmaui_port_4 attachment_cmaui_port_6_test_nested3Level: - test_nested3Level - attachment_cmaui_port_6 - disk.write.bytes.rate_server_cmaui: - - abstract_cmaui_1 - - disk.write.bytes.rate_cmaui - disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level: - - test_nested3Level - - disk.device.write.bytes_server_cmaui_test_nested4Level network.outgoing.packets.rate_cmaui_port_6_test_nested3Level: - test_nested3Level - network.outgoing.packets.rate_cmaui_port_6 - disk.device.read.bytes.rate_server_cmaui: + disk.allocation_server_cmaui_2: - abstract_cmaui_1 - - disk.device.read.bytes.rate_cmaui + - disk.allocation_cmaui + disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - disk.device.allocation_server_cmaui_4_test_nested4Level + binding_server_cmaui_2: + - abstract_cmaui_1 + - binding_cmaui + vcpus_server_cmaui_2: + - abstract_cmaui_1 + - vcpus_cmaui network.outgoing.packets.rate_cmaui_port_4: - abstract_cmaui_1 - network.outgoing.packets.rate_cmaui_cmaui_port_4 - disk.write.requests.rate_server_cmaui_test_nested3Level: + instance_server_cmaui_3_test_nested3Level: - test_nested3Level - - disk.write.requests.rate_server_cmaui + - instance_server_cmaui_3 attachment_cmaui_port_3: - abstract_cmaui_1 - attachment_cmaui_cmaui_port_3 - disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level: - - test_nested3Level - - disk.write.bytes_server_cmaui_test_nested4Level attachment_cmaui_port_4: - abstract_cmaui_1 - attachment_cmaui_cmaui_port_4 - disk.iops_server_cmaui_test_nested3Level: - - test_nested3Level - - disk.iops_server_cmaui - host_server_cmaui_test_nested4Level_test_nested3Level: - - test_nested3Level - - host_server_cmaui_test_nested4Level - disk.device.latency_server_cmaui: + scalable_server_cmaui_2: - abstract_cmaui_1 - - disk.device.latency_cmaui - disk.read.requests_server_cmaui: - - abstract_cmaui_1 - - disk.read.requests_cmaui - disk.device.allocation_server_cmaui_test_nested3Level: + - scalable_cmaui + disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - - disk.device.allocation_server_cmaui - disk.device.read.requests_server_cmaui_test_nested4Level_test_nested3Level: + - disk.write.requests.rate_server_cmaui_4_test_nested4Level + disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - - disk.device.read.requests_server_cmaui_test_nested4Level - disk.device.capacity_server_cmaui: - - abstract_cmaui_1 - - disk.device.capacity_cmaui - disk.usage_server_cmaui: - - abstract_cmaui_1 - - disk.usage_cmaui + - disk.capacity_server_cmaui_4_test_nested4Level network.outgoing.packets.rate_cmaui_port_3: - abstract_cmaui_1 - network.outgoing.packets.rate_cmaui_cmaui_port_3 - disk.device.usage_server_cmaui: - - abstract_cmaui_1 - - disk.device.usage_cmaui - disk.device.iops_server_cmaui_test_nested3Level: + disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level: - test_nested3Level - - disk.device.iops_server_cmaui + - disk.device.read.bytes.rate_server_cmaui_3 network.incoming.packets.rate_cmaui_port_5_test_nested3Level: - test_nested3Level - network.incoming.packets.rate_cmaui_port_5 - disk.allocation_server_cmaui_test_nested4Level_test_nested3Level: - - test_nested3Level - - disk.allocation_server_cmaui_test_nested4Level - disk.capacity_server_cmaui: + disk.write.requests_server_cmaui_2: - abstract_cmaui_1 - - disk.capacity_cmaui - disk.write.requests.rate_server_cmaui: - - abstract_cmaui_1 - - disk.write.requests.rate_cmaui - os_server_cmaui_test_nested4Level_test_nested3Level: + - disk.write.requests_cmaui + memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - - os_server_cmaui_test_nested4Level + - memory.resident_server_cmaui_4_test_nested4Level network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level: - test_nested3Level - network.outpoing.packets_cmaui_port_7_test_nested4Level - disk.device.latency_server_cmaui_test_nested3Level: + disk.usage_server_cmaui_2: + - abstract_cmaui_1 + - disk.usage_cmaui + disk.device.usage_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.usage_server_cmaui_3 + disk.write.bytes_server_cmaui_3_test_nested3Level: - test_nested3Level - - disk.device.latency_server_cmaui + - disk.write.bytes_server_cmaui_3 + feature_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - feature_server_cmaui_4_test_nested4Level network.incoming.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level: - test_nested3Level - network.incoming.bytes.rate_cmaui_port_8_test_nested4Level binding_cmaui_port_7_test_nested4Level_test_nested3Level: - test_nested3Level - binding_cmaui_port_7_test_nested4Level - disk.root.size_server_cmaui_test_nested4Level_test_nested3Level: + disk.write.requests.rate_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.write.requests.rate_server_cmaui_3 + disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - - disk.root.size_server_cmaui_test_nested4Level - disk.device.read.requests_server_cmaui: + - disk.device.read.bytes_server_cmaui_4_test_nested4Level + endpoint_server_cmaui_2: - abstract_cmaui_1 - - disk.device.read.requests_cmaui + - endpoint_cmaui network.incoming.bytes_cmaui_port_6_test_nested3Level: - test_nested3Level - network.incoming.bytes_cmaui_port_6 - memory_server_cmaui: + os_server_cmaui_2: - abstract_cmaui_1 - - memory_cmaui - disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level: + - os_cmaui + disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - - disk.read.bytes.rate_server_cmaui_test_nested4Level - disk.read.requests_server_cmaui_test_nested3Level: + - disk.read.requests_server_cmaui_4_test_nested4Level + scalable_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - - disk.read.requests_server_cmaui + - scalable_server_cmaui_4_test_nested4Level network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level: - test_nested3Level - network.incoming.packets.rate_cmaui_port_8_test_nested4Level - binding_server_cmaui: - - abstract_cmaui_1 - - binding_cmaui - disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level: - - test_nested3Level - - disk.device.usage_server_cmaui_test_nested4Level - disk.device.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level: - - test_nested3Level - - disk.device.read.requests.rate_server_cmaui_test_nested4Level - disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level: - - test_nested3Level - - disk.device.write.requests.rate_server_cmaui_test_nested4Level attachment_cmaui_port_5_test_nested3Level: - test_nested3Level - attachment_cmaui_port_5 - disk.device.read.requests.rate_server_cmaui: + disk.device.allocation_server_cmaui_2: - abstract_cmaui_1 - - disk.device.read.requests.rate_cmaui - feature_server_cmaui_test_nested4Level_test_nested3Level: - - test_nested3Level - - feature_server_cmaui_test_nested4Level - binding_server_cmaui_test_nested4Level_test_nested3Level: - - test_nested3Level - - binding_server_cmaui_test_nested4Level + - disk.device.allocation_cmaui network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level: - test_nested3Level - network.incoming.packets_cmaui_port_7_test_nested4Level - disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level: + disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - - disk.read.bytes_server_cmaui_test_nested4Level - disk.write.bytes_server_cmaui: - - abstract_cmaui_1 - - disk.write.bytes_cmaui - host_server_cmaui_test_nested3Level: + - disk.device.latency_server_cmaui_4_test_nested4Level + disk.read.bytes_server_cmaui_3_test_nested3Level: - test_nested3Level - - host_server_cmaui - scalable_server_cmaui_test_nested4Level_test_nested3Level: + - disk.read.bytes_server_cmaui_3 + disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - - scalable_server_cmaui_test_nested4Level + - disk.latency_server_cmaui_4_test_nested4Level + disk.device.allocation_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.allocation_server_cmaui_3 network.incoming.bytes.rate_cmaui_port_5_test_nested3Level: - test_nested3Level - network.incoming.bytes.rate_cmaui_port_5 + host_server_cmaui_2: + - abstract_cmaui_1 + - host_cmaui + os_server_cmaui_3_test_nested3Level: + - test_nested3Level + - os_server_cmaui_3 + disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - disk.read.bytes_server_cmaui_4_test_nested4Level + disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - disk.write.requests_server_cmaui_4_test_nested4Level network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level: - test_nested3Level - network.incoming.packets_cmaui_port_8_test_nested4Level + binding_server_cmaui_3_test_nested3Level: + - test_nested3Level + - binding_server_cmaui_3 feature_test_nested3Level: - test_nested3Level - feature - disk.device.write.bytes_server_cmaui_test_nested3Level: - - test_nested3Level - - disk.device.write.bytes_server_cmaui network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level: - test_nested3Level - network.outgoing.packets.rate_cmaui_port_8_test_nested4Level - attachment_cmaui_port_8_test_nested4Level_test_nested3Level: + cpu_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - - attachment_cmaui_port_8_test_nested4Level - disk.read.bytes.rate_server_cmaui_test_nested3Level: + - cpu_server_cmaui_4_test_nested4Level + cpu.delta_server_cmaui_3_test_nested3Level: - test_nested3Level - - disk.read.bytes.rate_server_cmaui - disk.device.write.bytes.rate_server_cmaui_test_nested3Level: + - cpu.delta_server_cmaui_3 + disk.device.capacity_server_cmaui_3_test_nested3Level: - test_nested3Level - - disk.device.write.bytes.rate_server_cmaui - disk.device.write.requests.rate_server_cmaui_test_nested3Level: + - disk.device.capacity_server_cmaui_3 + disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - - disk.device.write.requests.rate_server_cmaui - disk.capacity_server_cmaui_test_nested3Level: + - disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level + attachment_cmaui_port_8_test_nested4Level_test_nested3Level: + - test_nested3Level + - attachment_cmaui_port_8_test_nested4Level + scalable_server_cmaui_3_test_nested3Level: - test_nested3Level - - disk.capacity_server_cmaui - disk.usage_server_cmaui_test_nested4Level_test_nested3Level: + - scalable_server_cmaui_3 + instance_server_cmaui_2: + - abstract_cmaui_1 + - instance_cmaui + disk.device.iops_server_cmaui_3_test_nested3Level: - test_nested3Level - - disk.usage_server_cmaui_test_nested4Level + - disk.device.iops_server_cmaui_3 network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level: - test_nested3Level - network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level - memory.resident_server_cmaui: - - abstract_cmaui_1 - - memory.resident_cmaui network.incoming.bytes_cmaui_port_5_test_nested3Level: - test_nested3Level - network.incoming.bytes_cmaui_port_5 - disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level: + endpoint_server_cmaui_3_test_nested3Level: - test_nested3Level - - disk.device.allocation_server_cmaui_test_nested4Level + - endpoint_server_cmaui_3 + vcpus_server_cmaui_3_test_nested3Level: + - test_nested3Level + - vcpus_server_cmaui_3 network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level: - test_nested3Level - network.incoming.packets.rate_cmaui_port_7_test_nested4Level - disk.write.requests_server_cmaui_test_nested3Level: + disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - - disk.write.requests_server_cmaui - disk.latency_server_cmaui: - - abstract_cmaui_1 - - disk.latency_cmaui + - disk.allocation_server_cmaui_4_test_nested4Level network.outpoing.packets_cmaui_port_6_test_nested3Level: - test_nested3Level - network.outpoing.packets_cmaui_port_6 - vcpus_server_cmaui: - - abstract_cmaui_1 - - vcpus_cmaui network.outgoing.bytes_cmaui_port_4: - abstract_cmaui_1 - network.outgoing.bytes_cmaui_cmaui_port_4 network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level: - test_nested3Level - network.outgoing.packets.rate_cmaui_port_7_test_nested4Level - disk.device.write.bytes_server_cmaui: - - abstract_cmaui_1 - - disk.device.write.bytes_cmaui - instance_server_cmaui_test_nested3Level: - - test_nested3Level - - instance_server_cmaui binding_cmaui_port_5_test_nested3Level: - test_nested3Level - binding_cmaui_port_5 @@ -658,91 +643,106 @@ topology_template: network.incoming.bytes.rate_cmaui_port_4: - abstract_cmaui_1 - network.incoming.bytes.rate_cmaui_cmaui_port_4 + disk.device.write.bytes_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.write.bytes_server_cmaui_3 network.outgoing.bytes_cmaui_port_5_test_nested3Level: - test_nested3Level - network.outgoing.bytes_cmaui_port_5 - cpu_util_server_cmaui_test_nested4Level_test_nested3Level: + disk.device.read.requests_server_cmaui_2: + - abstract_cmaui_1 + - disk.device.read.requests_cmaui + disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - - cpu_util_server_cmaui_test_nested4Level - disk.allocation_server_cmaui: + - disk.device.read.requests_server_cmaui_4_test_nested4Level + disk.read.bytes.rate_server_cmaui_2: - abstract_cmaui_1 - - disk.allocation_cmaui - disk.write.requests_server_cmaui: + - disk.read.bytes.rate_cmaui + network.outpoing.packets_cmaui_port_3: - abstract_cmaui_1 - - disk.write.requests_cmaui - cpu_server_cmaui_test_nested3Level: - - test_nested3Level - - cpu_server_cmaui - disk.usage_server_cmaui_test_nested3Level: + - network.outpoing.packets_cmaui_cmaui_port_3 + disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - - disk.usage_server_cmaui - disk.write.bytes_server_cmaui_test_nested3Level: + - disk.device.write.requests_server_cmaui_4_test_nested4Level + disk.capacity_server_cmaui_3_test_nested3Level: - test_nested3Level - - disk.write.bytes_server_cmaui - network.outpoing.packets_cmaui_port_3: + - disk.capacity_server_cmaui_3 + cpu.delta_server_cmaui_2: - abstract_cmaui_1 - - network.outpoing.packets_cmaui_cmaui_port_3 + - cpu.delta_cmaui + disk.device.read.requests.rate_server_cmaui_2: + - abstract_cmaui_1 + - disk.device.read.requests.rate_cmaui network.outpoing.packets_cmaui_port_4: - abstract_cmaui_1 - network.outpoing.packets_cmaui_cmaui_port_4 + binding_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - binding_server_cmaui_4_test_nested4Level network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level: - test_nested3Level - network.incoming.bytes.rate_cmaui_port_7_test_nested4Level + memory.resident_server_cmaui_2: + - abstract_cmaui_1 + - memory.resident_cmaui + disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level binding_cmaui_port_8_test_nested4Level_test_nested3Level: - test_nested3Level - binding_cmaui_port_8_test_nested4Level - scalable_server_cmaui_test_nested3Level: + disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - - scalable_server_cmaui - endpoint_server_cmaui: - - abstract_cmaui_1 - - endpoint_cmaui + - disk.write.bytes_server_cmaui_4_test_nested4Level + disk.device.read.requests_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.read.requests_server_cmaui_3 feature_cmaui_port_5_test_nested3Level: - test_nested3Level - feature_cmaui_port_5 - cpu.delta_server_cmaui_test_nested4Level_test_nested3Level: - - test_nested3Level - - cpu.delta_server_cmaui_test_nested4Level network.incoming.packets_cmaui_port_5_test_nested3Level: - test_nested3Level - network.incoming.packets_cmaui_port_5 - disk.device.iops_server_cmaui_test_nested4Level_test_nested3Level: - - test_nested3Level - - disk.device.iops_server_cmaui_test_nested4Level - disk.write.bytes.rate_server_cmaui_test_nested3Level: - - test_nested3Level - - disk.write.bytes.rate_server_cmaui - disk.device.read.requests.rate_server_cmaui_test_nested3Level: - - test_nested3Level - - disk.device.read.requests.rate_server_cmaui - disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level: + disk.latency_server_cmaui_2: + - abstract_cmaui_1 + - disk.latency_cmaui + disk.ephemeral.size_server_cmaui_3_test_nested3Level: - test_nested3Level - - disk.read.requests_server_cmaui_test_nested4Level + - disk.ephemeral.size_server_cmaui_3 network.outgoing.packets.rate_cmaui_port_5_test_nested3Level: - test_nested3Level - network.outgoing.packets.rate_cmaui_port_5 - disk.latency_server_cmaui_test_nested4Level_test_nested3Level: + disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - - disk.latency_server_cmaui_test_nested4Level + - disk.device.read.requests.rate_server_cmaui_4_test_nested4Level + disk.device.read.bytes_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.read.bytes_server_cmaui_3 + memory.resident_server_cmaui_3_test_nested3Level: + - test_nested3Level + - memory.resident_server_cmaui_3 + memory.usage_server_cmaui_2: + - abstract_cmaui_1 + - memory.usage_cmaui requirements: link_cmaui_port_5_test_nested3Level: - test_nested3Level - link_cmaui_port_5 - dependency_server_cmaui_test_nested3Level: + dependency_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - dependency_server_cmaui_4_test_nested4Level + local_storage_server_cmaui_3_test_nested3Level: - test_nested3Level - - dependency_server_cmaui + - local_storage_server_cmaui_3 dependency_cmaui_port_6_test_nested3Level: - test_nested3Level - dependency_cmaui_port_6 - dependency_server_cmaui: - - abstract_cmaui_1 - - dependency_cmaui dependency_cmaui_port_7_test_nested4Level_test_nested3Level: - test_nested3Level - dependency_cmaui_port_7_test_nested4Level - local_storage_server_cmaui_test_nested4Level_test_nested3Level: - - test_nested3Level - - local_storage_server_cmaui_test_nested4Level + local_storage_server_cmaui_2: + - abstract_cmaui_1 + - local_storage_cmaui dependency_test_nested4Level_test_nested3Level: - test_nested3Level - dependency_test_nested4Level @@ -752,18 +752,18 @@ topology_template: link_cmaui_port_3: - abstract_cmaui_1 - link_cmaui_cmaui_port_3 - local_storage_server_cmaui: - - abstract_cmaui_1 - - local_storage_cmaui - dependency_server_cmaui_test_nested4Level_test_nested3Level: + dependency_server_cmaui_3_test_nested3Level: - test_nested3Level - - dependency_server_cmaui_test_nested4Level + - dependency_server_cmaui_3 link_cmaui_port_6_test_nested3Level: - test_nested3Level - link_cmaui_port_6 link_cmaui_port_8_test_nested4Level_test_nested3Level: - test_nested3Level - link_cmaui_port_8_test_nested4Level + local_storage_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - local_storage_server_cmaui_4_test_nested4Level dependency_test_nested3Level: - test_nested3Level - dependency @@ -773,6 +773,9 @@ topology_template: dependency_cmaui_port_8_test_nested4Level_test_nested3Level: - test_nested3Level - dependency_cmaui_port_8_test_nested4Level + dependency_server_cmaui_2: + - abstract_cmaui_1 + - dependency_cmaui dependency_cmaui_port_4: - abstract_cmaui_1 - dependency_cmaui_cmaui_port_4 @@ -781,7 +784,4 @@ topology_template: - dependency_cmaui_cmaui_port_3 dependency_cmaui_port_5_test_nested3Level: - test_nested3Level - - dependency_cmaui_port_5 - local_storage_server_cmaui_test_nested3Level: - - test_nested3Level - - local_storage_server_cmaui + - dependency_cmaui_port_5
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml index f312efdeb2..d8eca3f7f0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml @@ -164,129 +164,138 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested3 capabilities: - cpu.delta_server_cmaui: - - abstract_cmaui - - cpu.delta_cmaui - disk.device.write.requests.rate_server_cmaui: + memory.usage_server_cmaui_4_test_nested4Level: + - test_nested4Level + - memory.usage_server_cmaui_4 + cpu_util_server_cmaui_4_test_nested4Level: + - test_nested4Level + - cpu_util_server_cmaui_4 + disk.device.usage_server_cmaui_3: - abstract_cmaui - - disk.device.write.requests.rate_cmaui - disk.device.allocation_server_cmaui: + - disk.device.usage_cmaui + disk.device.latency_server_cmaui_3: - abstract_cmaui - - disk.device.allocation_cmaui - memory_server_cmaui_test_nested4Level: + - disk.device.latency_cmaui + disk.read.requests_server_cmaui_4_test_nested4Level: - test_nested4Level - - memory_server_cmaui - scalable_server_cmaui: + - disk.read.requests_server_cmaui_4 + disk.root.size_server_cmaui_3: - abstract_cmaui - - scalable_cmaui - disk.read.bytes.rate_server_cmaui: + - disk.root.size_cmaui + disk.device.write.requests.rate_server_cmaui_3: - abstract_cmaui - - disk.read.bytes.rate_cmaui - instance_server_cmaui_test_nested4Level: - - test_nested4Level - - instance_server_cmaui - disk.root.size_server_cmaui_test_nested4Level: + - disk.device.write.requests.rate_cmaui + disk.write.bytes.rate_server_cmaui_4_test_nested4Level: - test_nested4Level - - disk.root.size_server_cmaui - disk.write.bytes_server_cmaui_test_nested4Level: + - disk.write.bytes.rate_server_cmaui_4 + disk.latency_server_cmaui_4_test_nested4Level: - test_nested4Level - - disk.write.bytes_server_cmaui - host_server_cmaui: + - disk.latency_server_cmaui_4 + disk.read.requests_server_cmaui_3: - abstract_cmaui - - host_cmaui - cpu_util_server_cmaui: + - disk.read.requests_cmaui + disk.device.iops_server_cmaui_3: - abstract_cmaui - - cpu_util_cmaui - cpu_server_cmaui_test_nested4Level: - - test_nested4Level - - cpu_server_cmaui - vcpus_server_cmaui_test_nested4Level: - - test_nested4Level - - vcpus_server_cmaui - disk.device.usage_server_cmaui_test_nested4Level: - - test_nested4Level - - disk.device.usage_server_cmaui - disk.device.write.requests_server_cmaui: + - disk.device.iops_cmaui + disk.device.capacity_server_cmaui_3: - abstract_cmaui - - disk.device.write.requests_cmaui + - disk.device.capacity_cmaui + disk.device.read.bytes.rate_server_cmaui_3: + - abstract_cmaui + - disk.device.read.bytes.rate_cmaui network.incoming.bytes.rate_cmaui_port_7_test_nested4Level: - test_nested4Level - network.incoming.bytes.rate_cmaui_port_7 - instance_server_cmaui: - - abstract_cmaui - - instance_cmaui - disk.latency_server_cmaui_test_nested4Level: + feature_server_cmaui_4_test_nested4Level: - test_nested4Level - - disk.latency_server_cmaui - disk.device.read.bytes_server_cmaui: - - abstract_cmaui - - disk.device.read.bytes_cmaui - disk.device.capacity_server_cmaui_test_nested4Level: + - feature_server_cmaui_4 + disk.capacity_server_cmaui_4_test_nested4Level: - test_nested4Level - - disk.device.capacity_server_cmaui + - disk.capacity_server_cmaui_4 + disk.read.bytes_server_cmaui_3: + - abstract_cmaui + - disk.read.bytes_cmaui network.incoming.bytes.rate_cmaui_port_8_test_nested4Level: - test_nested4Level - network.incoming.bytes.rate_cmaui_port_8 - disk.root.size_server_cmaui: + disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level: + - test_nested4Level + - disk.device.write.bytes.rate_server_cmaui_4 + disk.device.read.requests_server_cmaui_4_test_nested4Level: + - test_nested4Level + - disk.device.read.requests_server_cmaui_4 + disk.device.write.requests_server_cmaui_4_test_nested4Level: + - test_nested4Level + - disk.device.write.requests_server_cmaui_4 + disk.write.requests.rate_server_cmaui_3: - abstract_cmaui - - disk.root.size_cmaui - host_server_cmaui_test_nested4Level: + - disk.write.requests.rate_cmaui + disk.device.write.requests.rate_server_cmaui_4_test_nested4Level: + - test_nested4Level + - disk.device.write.requests.rate_server_cmaui_4 + disk.device.read.bytes_server_cmaui_4_test_nested4Level: - test_nested4Level - - host_server_cmaui - os_server_cmaui: + - disk.device.read.bytes_server_cmaui_4 + disk.device.read.bytes_server_cmaui_3: - abstract_cmaui - - os_cmaui - disk.device.write.bytes.rate_server_cmaui: + - disk.device.read.bytes_cmaui + memory_server_cmaui_3: - abstract_cmaui - - disk.device.write.bytes.rate_cmaui - disk.device.read.requests.rate_server_cmaui_test_nested4Level: + - memory_cmaui + memory.resident_server_cmaui_4_test_nested4Level: + - test_nested4Level + - memory.resident_server_cmaui_4 + cpu_server_cmaui_3: + - abstract_cmaui + - cpu_cmaui + binding_server_cmaui_4_test_nested4Level: - test_nested4Level - - disk.device.read.requests.rate_server_cmaui + - binding_server_cmaui_4 network.incoming.packets_cmaui_port_5: - abstract_cmaui - network.incoming.packets_cmaui_cmaui_port_5 + os_server_cmaui_4_test_nested4Level: + - test_nested4Level + - os_server_cmaui_4 network.incoming.packets.rate_cmaui_port_7_test_nested4Level: - test_nested4Level - network.incoming.packets.rate_cmaui_port_7 - disk.allocation_server_cmaui_test_nested4Level: + disk.ephemeral.size_server_cmaui_3: + - abstract_cmaui + - disk.ephemeral.size_cmaui + cpu.delta_server_cmaui_4_test_nested4Level: - test_nested4Level - - disk.allocation_server_cmaui + - cpu.delta_server_cmaui_4 network.incoming.packets_cmaui_port_6: - abstract_cmaui - network.incoming.packets_cmaui_cmaui_port_6 - disk.device.write.bytes.rate_server_cmaui_test_nested4Level: + disk.capacity_server_cmaui_3: + - abstract_cmaui + - disk.capacity_cmaui + disk.device.capacity_server_cmaui_4_test_nested4Level: - test_nested4Level - - disk.device.write.bytes.rate_server_cmaui + - disk.device.capacity_server_cmaui_4 network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level: - test_nested4Level - network.outgoing.bytes.rate_cmaui_port_7 - disk.device.write.bytes_server_cmaui_test_nested4Level: - - test_nested4Level - - disk.device.write.bytes_server_cmaui - disk.device.write.requests.rate_server_cmaui_test_nested4Level: + scalable_server_cmaui_4_test_nested4Level: - test_nested4Level - - disk.device.write.requests.rate_server_cmaui - disk.device.iops_server_cmaui_test_nested4Level: + - scalable_server_cmaui_4 + disk.device.iops_server_cmaui_4_test_nested4Level: - test_nested4Level - - disk.device.iops_server_cmaui - disk.read.requests_server_cmaui_test_nested4Level: + - disk.device.iops_server_cmaui_4 + disk.read.bytes.rate_server_cmaui_4_test_nested4Level: - test_nested4Level - - disk.read.requests_server_cmaui - disk.ephemeral.size_server_cmaui_test_nested4Level: + - disk.read.bytes.rate_server_cmaui_4 + endpoint_server_cmaui_4_test_nested4Level: - test_nested4Level - - disk.ephemeral.size_server_cmaui - binding_server_cmaui_test_nested4Level: - - test_nested4Level - - binding_server_cmaui + - endpoint_server_cmaui_4 network.outgoing.bytes_cmaui_port_8_test_nested4Level: - test_nested4Level - network.outgoing.bytes_cmaui_port_8 - disk.usage_server_cmaui_test_nested4Level: + vcpus_server_cmaui_4_test_nested4Level: - test_nested4Level - - disk.usage_server_cmaui - feature_server_cmaui: - - abstract_cmaui - - feature_cmaui + - vcpus_server_cmaui_4 binding_cmaui_port_5: - abstract_cmaui - binding_cmaui_cmaui_port_5 @@ -296,21 +305,21 @@ topology_template: binding_cmaui_port_6: - abstract_cmaui - binding_cmaui_cmaui_port_6 + disk.device.write.requests_server_cmaui_3: + - abstract_cmaui + - disk.device.write.requests_cmaui network.outgoing.packets.rate_cmaui_port_8_test_nested4Level: - test_nested4Level - network.outgoing.packets.rate_cmaui_port_8 - memory.usage_server_cmaui: - - abstract_cmaui - - memory.usage_cmaui - disk.ephemeral.size_server_cmaui: - - abstract_cmaui - - disk.ephemeral.size_cmaui - feature_server_cmaui_test_nested4Level: + disk.write.bytes_server_cmaui_4_test_nested4Level: - test_nested4Level - - feature_server_cmaui - disk.read.bytes.rate_server_cmaui_test_nested4Level: + - disk.write.bytes_server_cmaui_4 + disk.write.requests.rate_server_cmaui_4_test_nested4Level: - test_nested4Level - - disk.read.bytes.rate_server_cmaui + - disk.write.requests.rate_server_cmaui_4 + disk.iops_server_cmaui_3: + - abstract_cmaui + - disk.iops_cmaui network.outgoing.bytes.rate_cmaui_port_6: - abstract_cmaui - network.outgoing.bytes.rate_cmaui_cmaui_port_6 @@ -323,75 +332,78 @@ topology_template: network.incoming.bytes_cmaui_port_5: - abstract_cmaui - network.incoming.bytes_cmaui_cmaui_port_5 - disk.iops_server_cmaui: + host_server_cmaui_4_test_nested4Level: + - test_nested4Level + - host_server_cmaui_4 + cpu_util_server_cmaui_3: - abstract_cmaui - - disk.iops_cmaui - disk.device.iops_server_cmaui: + - cpu_util_cmaui + disk.device.write.bytes.rate_server_cmaui_3: - abstract_cmaui - - disk.device.iops_cmaui - disk.capacity_server_cmaui_test_nested4Level: - - test_nested4Level - - disk.capacity_server_cmaui - disk.read.bytes_server_cmaui: + - disk.device.write.bytes.rate_cmaui + disk.write.bytes.rate_server_cmaui_3: - abstract_cmaui - - disk.read.bytes_cmaui - scalable_server_cmaui_test_nested4Level: - - test_nested4Level - - scalable_server_cmaui + - disk.write.bytes.rate_cmaui + disk.device.write.bytes_server_cmaui_3: + - abstract_cmaui + - disk.device.write.bytes_cmaui network.incoming.bytes_cmaui_port_8_test_nested4Level: - test_nested4Level - network.incoming.bytes_cmaui_port_8 network.outpoing.packets_cmaui_port_8_test_nested4Level: - test_nested4Level - network.outpoing.packets_cmaui_port_8 - disk.device.read.bytes.rate_server_cmaui_test_nested4Level: + disk.iops_server_cmaui_4_test_nested4Level: - test_nested4Level - - disk.device.read.bytes.rate_server_cmaui + - disk.iops_server_cmaui_4 + feature_server_cmaui_3: + - abstract_cmaui + - feature_cmaui feature_cmaui_port_5: - abstract_cmaui - feature_cmaui_cmaui_port_5 - disk.device.allocation_server_cmaui_test_nested4Level: - - test_nested4Level - - disk.device.allocation_server_cmaui feature_cmaui_port_6: - abstract_cmaui - feature_cmaui_cmaui_port_6 - disk.device.write.requests_server_cmaui_test_nested4Level: + cpu_server_cmaui_4_test_nested4Level: - test_nested4Level - - disk.device.write.requests_server_cmaui - cpu_server_cmaui: - - abstract_cmaui - - cpu_cmaui - disk.write.bytes.rate_server_cmaui_test_nested4Level: - - test_nested4Level - - disk.write.bytes.rate_server_cmaui + - cpu_server_cmaui_4 attachment_cmaui_port_7_test_nested4Level: - test_nested4Level - attachment_cmaui_port_7 - disk.write.requests.rate_server_cmaui_test_nested4Level: - - test_nested4Level - - disk.write.requests.rate_server_cmaui binding_cmaui_port_8_test_nested4Level: - test_nested4Level - binding_cmaui_port_8 + disk.write.bytes_server_cmaui_3: + - abstract_cmaui + - disk.write.bytes_cmaui network.incoming.packets.rate_cmaui_port_5: - abstract_cmaui - network.incoming.packets.rate_cmaui_cmaui_port_5 - disk.write.bytes.rate_server_cmaui: + disk.allocation_server_cmaui_3: - abstract_cmaui - - disk.write.bytes.rate_cmaui - disk.device.read.bytes.rate_server_cmaui: - - abstract_cmaui - - disk.device.read.bytes.rate_cmaui + - disk.allocation_cmaui attachment_cmaui_port_6: - abstract_cmaui - attachment_cmaui_cmaui_port_6 + binding_server_cmaui_3: + - abstract_cmaui + - binding_cmaui + vcpus_server_cmaui_3: + - abstract_cmaui + - vcpus_cmaui network.outgoing.packets.rate_cmaui_port_7_test_nested4Level: - test_nested4Level - network.outgoing.packets.rate_cmaui_port_7 + instance_server_cmaui_4_test_nested4Level: + - test_nested4Level + - instance_server_cmaui_4 network.outgoing.packets.rate_cmaui_port_5: - abstract_cmaui - network.outgoing.packets.rate_cmaui_cmaui_port_5 + scalable_server_cmaui_3: + - abstract_cmaui + - scalable_cmaui network.outgoing.packets.rate_cmaui_port_6: - abstract_cmaui - network.outgoing.packets.rate_cmaui_cmaui_port_6 @@ -401,166 +413,154 @@ topology_template: feature_cmaui_port_8_test_nested4Level: - test_nested4Level - feature_cmaui_port_8 - disk.device.latency_server_cmaui: - - abstract_cmaui - - disk.device.latency_cmaui - disk.read.requests_server_cmaui: - - abstract_cmaui - - disk.read.requests_cmaui - disk.device.capacity_server_cmaui: - - abstract_cmaui - - disk.device.capacity_cmaui - disk.usage_server_cmaui: - - abstract_cmaui - - disk.usage_cmaui - disk.device.usage_server_cmaui: + disk.write.requests_server_cmaui_3: - abstract_cmaui - - disk.device.usage_cmaui + - disk.write.requests_cmaui network.outpoing.packets_cmaui_port_7_test_nested4Level: - test_nested4Level - network.outpoing.packets_cmaui_port_7 - disk.capacity_server_cmaui: - - abstract_cmaui - - disk.capacity_cmaui - disk.write.requests.rate_server_cmaui: - - abstract_cmaui - - disk.write.requests.rate_cmaui attachment_cmaui_port_8_test_nested4Level: - test_nested4Level - attachment_cmaui_port_8 + disk.usage_server_cmaui_3: + - abstract_cmaui + - disk.usage_cmaui + disk.device.write.bytes_server_cmaui_4_test_nested4Level: + - test_nested4Level + - disk.device.write.bytes_server_cmaui_4 network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level: - test_nested4Level - network.outgoing.bytes.rate_cmaui_port_8 - disk.iops_server_cmaui_test_nested4Level: - - test_nested4Level - - disk.iops_server_cmaui - disk.device.read.requests_server_cmaui: - - abstract_cmaui - - disk.device.read.requests_cmaui feature_cmaui_port_7_test_nested4Level: - test_nested4Level - feature_cmaui_port_7 - endpoint_server_cmaui_test_nested4Level: + endpoint_server_cmaui_3: + - abstract_cmaui + - endpoint_cmaui + memory_server_cmaui_4_test_nested4Level: - test_nested4Level - - endpoint_server_cmaui + - memory_server_cmaui_4 network.incoming.packets.rate_cmaui_port_6: - abstract_cmaui - network.incoming.packets.rate_cmaui_cmaui_port_6 - memory_server_cmaui: + os_server_cmaui_3: - abstract_cmaui - - memory_cmaui - cpu.delta_server_cmaui_test_nested4Level: - - test_nested4Level - - cpu.delta_server_cmaui - memory.resident_server_cmaui_test_nested4Level: + - os_cmaui + disk.root.size_server_cmaui_4_test_nested4Level: - test_nested4Level - - memory.resident_server_cmaui + - disk.root.size_server_cmaui_4 binding_cmaui_port_7_test_nested4Level: - test_nested4Level - binding_cmaui_port_7 - binding_server_cmaui: - - abstract_cmaui - - binding_cmaui - disk.device.read.requests.rate_server_cmaui: - - abstract_cmaui - - disk.device.read.requests.rate_cmaui - disk.write.bytes_server_cmaui: + disk.usage_server_cmaui_4_test_nested4Level: + - test_nested4Level + - disk.usage_server_cmaui_4 + disk.device.latency_server_cmaui_4_test_nested4Level: + - test_nested4Level + - disk.device.latency_server_cmaui_4 + disk.device.read.requests.rate_server_cmaui_4_test_nested4Level: + - test_nested4Level + - disk.device.read.requests.rate_server_cmaui_4 + disk.ephemeral.size_server_cmaui_4_test_nested4Level: + - test_nested4Level + - disk.ephemeral.size_server_cmaui_4 + disk.device.allocation_server_cmaui_3: - abstract_cmaui - - disk.write.bytes_cmaui - network.outgoing.bytes_cmaui_port_7_test_nested4Level: + - disk.device.allocation_cmaui + disk.read.bytes_server_cmaui_4_test_nested4Level: - test_nested4Level - - network.outgoing.bytes_cmaui_port_7 - disk.read.bytes_server_cmaui_test_nested4Level: + - disk.read.bytes_server_cmaui_4 + disk.allocation_server_cmaui_4_test_nested4Level: - test_nested4Level - - disk.read.bytes_server_cmaui - disk.device.read.requests_server_cmaui_test_nested4Level: + - disk.allocation_server_cmaui_4 + network.outgoing.bytes_cmaui_port_7_test_nested4Level: - test_nested4Level - - disk.device.read.requests_server_cmaui - disk.write.requests_server_cmaui_test_nested4Level: + - network.outgoing.bytes_cmaui_port_7 + disk.device.allocation_server_cmaui_4_test_nested4Level: - test_nested4Level - - disk.write.requests_server_cmaui - disk.device.latency_server_cmaui_test_nested4Level: + - disk.device.allocation_server_cmaui_4 + host_server_cmaui_3: + - abstract_cmaui + - host_cmaui + disk.write.requests_server_cmaui_4_test_nested4Level: - test_nested4Level - - disk.device.latency_server_cmaui + - disk.write.requests_server_cmaui_4 network.incoming.packets_cmaui_port_7_test_nested4Level: - test_nested4Level - network.incoming.packets_cmaui_port_7 feature_test_nested4Level: - test_nested4Level - feature - os_server_cmaui_test_nested4Level: - - test_nested4Level - - os_server_cmaui network.incoming.bytes.rate_cmaui_port_6: - abstract_cmaui - network.incoming.bytes.rate_cmaui_cmaui_port_6 - memory.resident_server_cmaui: + instance_server_cmaui_3: - abstract_cmaui - - memory.resident_cmaui + - instance_cmaui network.incoming.packets.rate_cmaui_port_8_test_nested4Level: - test_nested4Level - network.incoming.packets.rate_cmaui_port_8 - memory.usage_server_cmaui_test_nested4Level: - - test_nested4Level - - memory.usage_server_cmaui network.outpoing.packets_cmaui_port_5: - abstract_cmaui - network.outpoing.packets_cmaui_cmaui_port_5 - disk.latency_server_cmaui: - - abstract_cmaui - - disk.latency_cmaui network.outgoing.bytes_cmaui_port_6: - abstract_cmaui - network.outgoing.bytes_cmaui_cmaui_port_6 network.outpoing.packets_cmaui_port_6: - abstract_cmaui - network.outpoing.packets_cmaui_cmaui_port_6 + disk.read.bytes.rate_server_cmaui_3: + - abstract_cmaui + - disk.read.bytes.rate_cmaui network.outgoing.bytes_cmaui_port_5: - abstract_cmaui - network.outgoing.bytes_cmaui_cmaui_port_5 - vcpus_server_cmaui: - - abstract_cmaui - - vcpus_cmaui - disk.device.write.bytes_server_cmaui: - - abstract_cmaui - - disk.device.write.bytes_cmaui - disk.device.read.bytes_server_cmaui_test_nested4Level: + disk.device.usage_server_cmaui_4_test_nested4Level: - test_nested4Level - - disk.device.read.bytes_server_cmaui - cpu_util_server_cmaui_test_nested4Level: + - disk.device.usage_server_cmaui_4 + disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level: - test_nested4Level - - cpu_util_server_cmaui + - disk.device.read.bytes.rate_server_cmaui_4 network.incoming.bytes.rate_cmaui_port_5: - abstract_cmaui - network.incoming.bytes.rate_cmaui_cmaui_port_5 - disk.allocation_server_cmaui: + disk.device.read.requests_server_cmaui_3: - abstract_cmaui - - disk.allocation_cmaui - disk.write.requests_server_cmaui: - - abstract_cmaui - - disk.write.requests_cmaui + - disk.device.read.requests_cmaui network.incoming.bytes_cmaui_port_7_test_nested4Level: - test_nested4Level - network.incoming.bytes_cmaui_port_7 - endpoint_server_cmaui: + disk.device.read.requests.rate_server_cmaui_3: - abstract_cmaui - - endpoint_cmaui + - disk.device.read.requests.rate_cmaui + cpu.delta_server_cmaui_3: + - abstract_cmaui + - cpu.delta_cmaui + memory.resident_server_cmaui_3: + - abstract_cmaui + - memory.resident_cmaui + disk.latency_server_cmaui_3: + - abstract_cmaui + - disk.latency_cmaui + memory.usage_server_cmaui_3: + - abstract_cmaui + - memory.usage_cmaui requirements: dependency_cmaui_port_7_test_nested4Level: - test_nested4Level - dependency_cmaui_port_7 + local_storage_server_cmaui_4_test_nested4Level: + - test_nested4Level + - local_storage_server_cmaui_4 dependency_cmaui_port_6: - abstract_cmaui - dependency_cmaui_cmaui_port_6 - dependency_server_cmaui: - - abstract_cmaui - - dependency_cmaui dependency_cmaui_port_8_test_nested4Level: - test_nested4Level - dependency_cmaui_port_8 - local_storage_server_cmaui_test_nested4Level: - - test_nested4Level - - local_storage_server_cmaui + local_storage_server_cmaui_3: + - abstract_cmaui + - local_storage_cmaui link_cmaui_port_6: - abstract_cmaui - link_cmaui_cmaui_port_6 @@ -573,15 +573,15 @@ topology_template: link_cmaui_port_8_test_nested4Level: - test_nested4Level - link_cmaui_port_8 - local_storage_server_cmaui: - - abstract_cmaui - - local_storage_cmaui - dependency_server_cmaui_test_nested4Level: - - test_nested4Level - - dependency_server_cmaui link_cmaui_port_7_test_nested4Level: - test_nested4Level - link_cmaui_port_7 + dependency_server_cmaui_4_test_nested4Level: + - test_nested4Level + - dependency_server_cmaui_4 + dependency_server_cmaui_3: + - abstract_cmaui + - dependency_cmaui dependency_cmaui_port_5: - abstract_cmaui - - dependency_cmaui_cmaui_port_5 + - dependency_cmaui_cmaui_port_5
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml index afcc568feb..1d43dd817b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml @@ -147,8 +147,21 @@ topology_template: requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_cmaui + node: server_cmaui_4 relationship: tosca.relationships.network.BindsTo + server_cmaui_4: + type: org.openecomp.resource.vfc.compute.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_8: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: @@ -182,21 +195,8 @@ topology_template: requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_cmaui + node: server_cmaui_4 relationship: tosca.relationships.network.BindsTo - server_cmaui: - type: org.openecomp.resource.vfc.compute.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: nested4_group: type: org.openecomp.groups.heat.HeatStack @@ -205,119 +205,119 @@ topology_template: description: nested4 members: - cmaui_port_7 + - server_cmaui_4 - cmaui_port_8 - - server_cmaui substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.cmaui 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_server_cmaui_4: + - server_cmaui_4 + - disk.write.bytes + disk.device.write.bytes_server_cmaui_4: + - server_cmaui_4 + - disk.device.write.bytes + feature_server_cmaui_4: + - server_cmaui_4 + - feature + disk.device.latency_server_cmaui_4: + - server_cmaui_4 + - disk.device.latency + disk.device.usage_server_cmaui_4: + - server_cmaui_4 + - disk.device.usage feature_cmaui_port_7: - cmaui_port_7 - feature feature_cmaui_port_8: - cmaui_port_8 - feature - 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.read.requests_server_cmaui_4: + - server_cmaui_4 + - disk.read.requests + disk.allocation_server_cmaui_4: + - server_cmaui_4 + - disk.allocation network.outgoing.packets.rate_cmaui_port_8: - cmaui_port_8 - network.outgoing.packets.rate attachment_cmaui_port_7: - cmaui_port_7 - attachment + vcpus_server_cmaui_4: + - server_cmaui_4 + - vcpus + binding_server_cmaui_4: + - server_cmaui_4 + - binding + disk.root.size_server_cmaui_4: + - server_cmaui_4 + - disk.root.size + disk.device.write.requests.rate_server_cmaui_4: + - server_cmaui_4 + - disk.device.write.requests.rate attachment_cmaui_port_8: - cmaui_port_8 - attachment + scalable_server_cmaui_4: + - server_cmaui_4 + - scalable network.outgoing.packets.rate_cmaui_port_7: - cmaui_port_7 - network.outgoing.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 - disk.device.capacity_server_cmaui: - - server_cmaui - - disk.device.capacity - disk.usage_server_cmaui: - - server_cmaui + disk.write.requests_server_cmaui_4: + - server_cmaui_4 + - disk.write.requests + disk.usage_server_cmaui_4: + - server_cmaui_4 - disk.usage - disk.device.usage_server_cmaui: - - server_cmaui - - disk.device.usage - 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: - - server_cmaui - - disk.device.read.requests - instance_server_cmaui: - - server_cmaui - - instance - disk.device.read.bytes_server_cmaui: - - server_cmaui - - disk.device.read.bytes + disk.device.capacity_server_cmaui_4: + - server_cmaui_4 + - disk.device.capacity + disk.device.iops_server_cmaui_4: + - server_cmaui_4 + - disk.device.iops + disk.device.read.bytes.rate_server_cmaui_4: + - server_cmaui_4 + - disk.device.read.bytes.rate + endpoint_server_cmaui_4: + - server_cmaui_4 + - endpoint + disk.read.bytes_server_cmaui_4: + - server_cmaui_4 + - disk.read.bytes network.incoming.packets.rate_cmaui_port_7: - cmaui_port_7 - network.incoming.packets.rate - memory_server_cmaui: - - server_cmaui - - memory + os_server_cmaui_4: + - server_cmaui_4 + - os network.incoming.packets.rate_cmaui_port_8: - cmaui_port_8 - network.incoming.packets.rate - disk.root.size_server_cmaui: - - server_cmaui - - disk.root.size - 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.device.allocation_server_cmaui_4: + - server_cmaui_4 + - disk.device.allocation + disk.write.requests.rate_server_cmaui_4: + - server_cmaui_4 + - disk.write.requests.rate + disk.device.read.bytes_server_cmaui_4: + - server_cmaui_4 + - disk.device.read.bytes + memory_server_cmaui_4: + - server_cmaui_4 + - memory + disk.write.bytes.rate_server_cmaui_4: + - server_cmaui_4 + - disk.write.bytes.rate + cpu_server_cmaui_4: + - server_cmaui_4 + - cpu + disk.capacity_server_cmaui_4: + - server_cmaui_4 + - disk.capacity + host_server_cmaui_4: + - server_cmaui_4 + - host network.incoming.packets_cmaui_port_7: - cmaui_port_7 - network.incoming.packets @@ -327,53 +327,53 @@ topology_template: network.incoming.bytes.rate_cmaui_port_7: - cmaui_port_7 - network.incoming.bytes.rate + instance_server_cmaui_4: + - server_cmaui_4 + - instance network.incoming.bytes.rate_cmaui_port_8: - cmaui_port_8 - network.incoming.bytes.rate - memory.resident_server_cmaui: - - server_cmaui - - memory.resident network.outgoing.bytes_cmaui_port_7: - cmaui_port_7 - network.outgoing.bytes - disk.latency_server_cmaui: - - server_cmaui - - disk.latency - feature_server_cmaui: - - server_cmaui - - feature network.outpoing.packets_cmaui_port_7: - cmaui_port_7 - network.outpoing.packets - vcpus_server_cmaui: - - server_cmaui - - vcpus + disk.read.bytes.rate_server_cmaui_4: + - server_cmaui_4 + - disk.read.bytes.rate network.outpoing.packets_cmaui_port_8: - cmaui_port_8 - network.outpoing.packets - disk.device.write.bytes_server_cmaui: - - server_cmaui - - disk.device.write.bytes + disk.device.write.requests_server_cmaui_4: + - server_cmaui_4 + - disk.device.write.requests binding_cmaui_port_7: - cmaui_port_7 - binding network.outgoing.bytes_cmaui_port_8: - cmaui_port_8 - network.outgoing.bytes + disk.device.read.requests_server_cmaui_4: + - server_cmaui_4 + - disk.device.read.requests binding_cmaui_port_8: - cmaui_port_8 - binding - disk.allocation_server_cmaui: - - server_cmaui - - disk.allocation - disk.write.requests_server_cmaui: - - server_cmaui - - disk.write.requests - memory.usage_server_cmaui: - - server_cmaui - - memory.usage - disk.ephemeral.size_server_cmaui: - - server_cmaui + disk.iops_server_cmaui_4: + - server_cmaui_4 + - disk.iops + disk.device.read.requests.rate_server_cmaui_4: + - server_cmaui_4 + - disk.device.read.requests.rate + cpu.delta_server_cmaui_4: + - server_cmaui_4 + - cpu.delta + memory.resident_server_cmaui_4: + - server_cmaui_4 + - memory.resident + disk.ephemeral.size_server_cmaui_4: + - server_cmaui_4 - disk.ephemeral.size network.outgoing.bytes.rate_cmaui_port_7: - cmaui_port_7 @@ -381,24 +381,24 @@ topology_template: network.incoming.bytes_cmaui_port_8: - cmaui_port_8 - network.incoming.bytes - endpoint_server_cmaui: - - server_cmaui - - endpoint network.incoming.bytes_cmaui_port_7: - cmaui_port_7 - network.incoming.bytes - disk.iops_server_cmaui: - - server_cmaui - - disk.iops + disk.latency_server_cmaui_4: + - server_cmaui_4 + - disk.latency network.outgoing.bytes.rate_cmaui_port_8: - cmaui_port_8 - network.outgoing.bytes.rate - disk.device.iops_server_cmaui: - - server_cmaui - - disk.device.iops - disk.read.bytes_server_cmaui: - - server_cmaui - - disk.read.bytes + disk.device.write.bytes.rate_server_cmaui_4: + - server_cmaui_4 + - disk.device.write.bytes.rate + memory.usage_server_cmaui_4: + - server_cmaui_4 + - memory.usage + cpu_util_server_cmaui_4: + - server_cmaui_4 + - cpu_util requirements: dependency_cmaui_port_8: - cmaui_port_8 @@ -412,9 +412,9 @@ topology_template: link_cmaui_port_7: - cmaui_port_7 - link - dependency_server_cmaui: - - server_cmaui + dependency_server_cmaui_4: + - server_cmaui_4 - dependency - local_storage_server_cmaui: - - server_cmaui - - local_storage + local_storage_server_cmaui_4: + - server_cmaui_4 + - 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/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/in/nested-oam_v0.1.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/in/nested-oam_v0.1.yaml index 77d7e26b21..caf8e405a6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/in/nested-oam_v0.1.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/in/nested-oam_v0.1.yaml @@ -66,10 +66,10 @@ resources: flavor: { get_param: oam_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} - pcm_port_0: + pcm_port_00: type: OS::Neutron::Port properties: network: { get_param: cps_net_name } @@ -77,7 +77,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 } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index c73d702699..2a56194be9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -582,43 +582,41 @@ node_types: org.openecomp.resource.abstract.nodes.heat.oam_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pcm_port_0_network_role: - type: string - required: true - status: SUPPORTED - port_pcm_port_1_network_role_tag: - type: string - required: true - status: SUPPORTED availabilityzone_name: type: string description: availabilityzone name required: true status: SUPPORTED - port_pcm_port_0_vlan_requirements: + port_pcm_port_00_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pcm_port_01_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements oam_server_name: type: string description: oam server name required: true status: SUPPORTED - port_pcm_port_0_order: - type: integer + port_pcm_port_00_subnetpoolid: + type: string required: true status: SUPPORTED - port_pcm_port_0_subnetpoolid: - type: string + port_pcm_port_01_vlan_requirements: + type: list required: true status: SUPPORTED - port_pcm_port_1_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pcm_port_01_network_role: type: string required: true status: SUPPORTED - port_pcm_port_0_network_role_tag: + port_pcm_port_01_subnetpoolid: type: string required: true status: SUPPORTED @@ -632,24 +630,20 @@ node_types: description: CPS network mask required: true status: SUPPORTED - port_pcm_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pcm_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED oam_net_name: type: string description: OAM network name required: true status: SUPPORTED - port_pcm_port_1_network_role: + port_pcm_port_01_network_role_tag: type: string required: true status: SUPPORTED - port_pcm_port_0_ip_requirements: + port_pcm_port_00_network_role: + type: string + required: true + status: SUPPORTED + port_pcm_port_00_ip_requirements: type: list required: true status: SUPPORTED @@ -675,31 +669,37 @@ node_types: description: CPS network ip required: true status: SUPPORTED - port_pcm_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pcm_port_00_network_role_tag: + type: string required: true status: SUPPORTED - port_pcm_port_1_vlan_requirements: - type: list + port_pcm_port_01_order: + type: integer + required: true + status: SUPPORTED + port_pcm_port_00_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pcm_port_00_order: + type: integer + required: true + status: SUPPORTED + port_pcm_port_01_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements pcm_vol: type: string description: CPS Cluman Cinder Volume required: true status: SUPPORTED - port_pcm_port_1_ip_requirements: + port_pcm_port_00_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.VlanRequirements cps_net_name: type: string description: CPS network name @@ -715,8 +715,8 @@ node_types: description: CPS network mask required: true status: SUPPORTED - port_pcm_port_1_order: - type: integer + port_pcm_port_01_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED attributes: @@ -739,27 +739,27 @@ node_types: occurrences: - 0 - UNBOUNDED - - 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_pcm_port_0: + - dependency_pcm_port_01: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_port_0: + - link_pcm_port_01: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -772,37 +772,35 @@ node_types: occurrences: - 1 - UNBOUNDED - 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. + 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: + memory_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory_server_oam: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pcm_port_01: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pcm_port_0: + disk.write.requests_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests_server_oam: + 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: @@ -820,154 +818,136 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_server_oam: + 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.allocation_server_oam: + 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.usage_server_oam: + disk.device.write.requests_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.usage_server_oam: + 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.write.bytes_server_oam: + disk.allocation_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pcm_port_0: + disk.device.usage_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_server_oam: + disk.usage_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.latency_server_oam: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pcm_port_00: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.root.size_server_oam: + disk.device.write.bytes_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.usage_server_oam: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pcm_port_01: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pcm_port_1: + 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 - 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 - disk.read.bytes_server_oam: + disk.ephemeral.size_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - os_server_oam: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - disk.read.requests_server_oam: + disk.device.latency_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.capacity_server_oam: + disk.root.size_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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_oam: type: org.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.bytes_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_pcm_port_0: - type: tosca.capabilities.Node + os_server_oam: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pcm_port_1: + disk.read.requests_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_pcm_port_0: - type: tosca.capabilities.Attachment + disk.capacity_server_oam: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_pcm_port_1: - type: tosca.capabilities.Attachment + disk.device.read.bytes_server_oam: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_server_oam: + 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: @@ -978,6 +958,12 @@ node_types: occurrences: - 1 - UNBOUNDED + 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 disk.device.read.requests.rate_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1037,55 +1023,69 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu.delta_server_oam: + 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 - host_server_oam: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + 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_oam: + 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 - network.outgoing.bytes.rate_pcm_port_1: + binding_pcm_port_01: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + cpu.delta_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - 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. + host_server_oam: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - binding_server_oam: + 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.outgoing.bytes.rate_pcm_port_0: + disk.device.write.bytes.rate_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_server_oam: + 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_1: + binding_server_oam: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1120,7 +1120,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: @@ -1132,7 +1132,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pcm_port_1: + 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: @@ -2016,4 +2016,4 @@ node_types: type: tosca.capabilities.network.Bindable occurrences: - 1 - - UNBOUNDED + - UNBOUNDED
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml index 924328f029..13c01e09ef 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml @@ -184,17 +184,19 @@ topology_template: directives: - substitutable properties: - port_pcm_port_1_network_role_tag: oam - availabilityzone_name: - get_input: availabilityzone_name - port_pcm_port_0_ip_requirements: + port_pcm_port_00_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + availabilityzone_name: + get_input: availabilityzone_name oam_net_gw: get_input: oam_net_gw + port_pcm_port_00_mac_requirements: + mac_count_required: + is_required: false oam_flavor_name: get_input: oam_flavor_name security_group_name: @@ -203,29 +205,26 @@ topology_template: get_input: - cps_net_ips - 0 + port_pcm_port_01_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false oam_server_name: get_input: - oam_server_names - 0 - port_pcm_port_1_mac_requirements: - mac_count_required: - is_required: false + port_pcm_port_00_network_role_tag: cps service_template_filter: substitute_service_template: nested-oam_v0.1ServiceTemplate.yaml + port_pcm_port_01_mac_requirements: + mac_count_required: + is_required: false pcm_vol: get_input: - pcm_volumes - 0 - port_pcm_port_1_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_pcm_port_0_network_role_tag: cps - port_pcm_port_0_mac_requirements: - mac_count_required: - is_required: false oam_image_name: get_input: oam_image_name cps_net_name: @@ -240,6 +239,7 @@ topology_template: get_input: oam_net_mask oam_net_name: get_input: oam_net_name + port_pcm_port_01_network_role_tag: oam server_pcm_001: type: org.openecomp.resource.abstract.nodes.heat.pcm_server directives: @@ -395,4 +395,4 @@ topology_template: - server_pcm_001 - packet_mirror_network - compute_port_0 - - abstract_compute + - abstract_compute
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml index 815fc7c18d..5abcd8ca3b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml @@ -11,39 +11,38 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pcm_port_0_network_role: - type: string - required: true - port_pcm_port_1_network_role_tag: - type: string - required: true availabilityzone_name: label: availabilityzone name hidden: false immutable: false type: string description: availabilityzone name - port_pcm_port_0_vlan_requirements: + port_pcm_port_00_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pcm_port_01_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements oam_server_name: label: oam server name hidden: false immutable: false type: string description: oam server name - port_pcm_port_0_order: - type: integer - required: true - port_pcm_port_0_subnetpoolid: + port_pcm_port_00_subnetpoolid: type: string required: true - port_pcm_port_1_subnetpoolid: + port_pcm_port_01_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pcm_port_01_network_role: type: string required: true - port_pcm_port_0_network_role_tag: + port_pcm_port_01_subnetpoolid: type: string required: true oam_image_name: @@ -58,22 +57,19 @@ topology_template: immutable: false type: string description: CPS network mask - port_pcm_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pcm_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true oam_net_name: label: OAM network name hidden: false immutable: false type: string description: OAM network name - port_pcm_port_1_network_role: + port_pcm_port_01_network_role_tag: type: string required: true - port_pcm_port_0_ip_requirements: + port_pcm_port_00_network_role: + type: string + required: true + port_pcm_port_00_ip_requirements: type: list required: true entry_schema: @@ -102,28 +98,32 @@ topology_template: immutable: false type: string description: CPS network ip - port_pcm_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pcm_port_00_network_role_tag: + type: string required: true - port_pcm_port_1_vlan_requirements: - type: list + port_pcm_port_01_order: + type: integer + required: true + port_pcm_port_00_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pcm_port_00_order: + type: integer + required: true + port_pcm_port_01_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements pcm_vol: label: CPS Cluman Cinder Volume hidden: false immutable: false type: string description: CPS Cluman Cinder Volume - port_pcm_port_1_ip_requirements: + port_pcm_port_00_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true + type: org.openecomp.datatypes.network.VlanRequirements cps_net_name: label: CPS network name hidden: false @@ -142,8 +142,8 @@ topology_template: immutable: false type: string description: CPS network mask - port_pcm_port_1_order: - type: integer + port_pcm_port_01_exCP_naming: + type: org.openecomp.datatypes.Naming required: true node_templates: server_oam: @@ -158,63 +158,63 @@ topology_template: config_drive: true name: get_input: oam_server_name - pcm_port_1: + pcm_port_00: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: - get_input: port_pcm_port_1_ip_requirements + get_input: port_pcm_port_00_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: port_pcm_port_1_network_role + get_input: port_pcm_port_00_network_role fixed_ips: - ip_address: - get_input: oam_net_ip + get_input: cps_net_ip subnetpoolid: - get_input: port_pcm_port_1_subnetpoolid + get_input: port_pcm_port_00_subnetpoolid mac_requirements: - get_input: port_pcm_port_1_mac_requirements + get_input: port_pcm_port_00_mac_requirements exCP_naming: - get_input: port_pcm_port_1_exCP_naming + get_input: port_pcm_port_00_exCP_naming vlan_requirements: - get_input: port_pcm_port_1_vlan_requirements + get_input: port_pcm_port_00_vlan_requirements network_role_tag: - get_input: port_pcm_port_1_network_role_tag + get_input: port_pcm_port_00_network_role_tag network: - get_input: oam_net_name + get_input: cps_net_name order: - get_input: port_pcm_port_1_order + get_input: port_pcm_port_00_order requirements: - binding: capability: tosca.capabilities.network.Bindable node: server_oam relationship: tosca.relationships.network.BindsTo - pcm_port_0: + pcm_port_01: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: - get_input: port_pcm_port_0_ip_requirements + get_input: port_pcm_port_01_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: port_pcm_port_0_network_role + get_input: port_pcm_port_01_network_role fixed_ips: - ip_address: - get_input: cps_net_ip + get_input: oam_net_ip subnetpoolid: - get_input: port_pcm_port_0_subnetpoolid + get_input: port_pcm_port_01_subnetpoolid mac_requirements: - get_input: port_pcm_port_0_mac_requirements + get_input: port_pcm_port_01_mac_requirements exCP_naming: - get_input: port_pcm_port_0_exCP_naming + get_input: port_pcm_port_01_exCP_naming vlan_requirements: - get_input: port_pcm_port_0_vlan_requirements + get_input: port_pcm_port_01_vlan_requirements network_role_tag: - get_input: port_pcm_port_0_network_role_tag + get_input: port_pcm_port_01_network_role_tag network: - get_input: cps_net_name + get_input: oam_net_name order: - get_input: port_pcm_port_0_order + get_input: port_pcm_port_01_order requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -228,8 +228,8 @@ topology_template: description: heat template that creates PCRF Cluman stack members: - server_oam - - pcm_port_1 - - pcm_port_0 + - pcm_port_00 + - pcm_port_01 outputs: server_oam_id: description: the oam nova service id @@ -240,33 +240,42 @@ topology_template: cpu_server_oam: - server_oam - cpu - network.incoming.packets.rate_pcm_port_0: - - pcm_port_0 - - network.incoming.packets.rate - 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 + network.incoming.packets_pcm_port_01: + - pcm_port_01 + - network.incoming.packets memory_server_oam: - server_oam - memory - network.outpoing.packets_pcm_port_0: - - pcm_port_0 - - network.outpoing.packets + feature_pcm_port_01: + - pcm_port_01 + - feature disk.write.requests_server_oam: - server_oam - disk.write.requests + network.incoming.packets_pcm_port_00: + - pcm_port_00 + - network.incoming.packets memory.resident_server_oam: - server_oam - memory.resident disk.device.iops_server_oam: - server_oam - disk.device.iops + 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 disk.device.write.requests_server_oam: - server_oam - disk.device.write.requests + network.incoming.bytes_pcm_port_01: + - pcm_port_01 + - network.incoming.bytes disk.allocation_server_oam: - server_oam - disk.allocation @@ -276,12 +285,18 @@ topology_template: disk.usage_server_oam: - server_oam - disk.usage + attachment_pcm_port_00: + - pcm_port_00 + - attachment disk.device.write.bytes_server_oam: - server_oam - disk.device.write.bytes - network.incoming.bytes_pcm_port_0: - - pcm_port_0 - - network.incoming.bytes + attachment_pcm_port_01: + - pcm_port_01 + - attachment + network.outgoing.bytes_pcm_port_00: + - pcm_port_00 + - network.outgoing.bytes disk.ephemeral.size_server_oam: - server_oam - disk.ephemeral.size @@ -291,18 +306,15 @@ topology_template: disk.root.size_server_oam: - server_oam - disk.root.size + network.outgoing.packets.rate_pcm_port_01: + - pcm_port_01 + - network.outgoing.packets.rate memory.usage_server_oam: - server_oam - memory.usage - 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.bytes_pcm_port_01: + - pcm_port_01 + - network.outgoing.bytes disk.read.bytes_server_oam: - server_oam - disk.read.bytes @@ -315,36 +327,18 @@ topology_template: disk.capacity_server_oam: - server_oam - disk.capacity - 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 - 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 disk.device.read.bytes_server_oam: - server_oam - disk.device.read.bytes + network.incoming.bytes.rate_pcm_port_00: + - pcm_port_00 + - network.incoming.bytes.rate endpoint_server_oam: - server_oam - endpoint + network.incoming.bytes.rate_pcm_port_01: + - pcm_port_01 + - network.incoming.bytes.rate disk.device.read.requests.rate_server_oam: - server_oam - disk.device.read.requests.rate @@ -375,33 +369,39 @@ topology_template: cpu_util_server_oam: - server_oam - 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 cpu.delta_server_oam: - server_oam - cpu.delta host_server_oam: - server_oam - host + binding_pcm_port_00: + - pcm_port_00 + - binding disk.device.write.bytes.rate_server_oam: - server_oam - disk.device.write.bytes.rate - network.outgoing.bytes.rate_pcm_port_1: - - pcm_port_1 + network.outgoing.bytes.rate_pcm_port_00: + - pcm_port_00 - network.outgoing.bytes.rate - network.incoming.packets_pcm_port_0: - - pcm_port_0 - - network.incoming.packets binding_server_oam: - server_oam - binding - network.outgoing.bytes.rate_pcm_port_0: - - pcm_port_0 - - network.outgoing.bytes.rate disk.device.capacity_server_oam: - server_oam - disk.device.capacity - network.incoming.packets_pcm_port_1: - - pcm_port_1 - - network.incoming.packets disk.latency_server_oam: - server_oam - disk.latency @@ -417,31 +417,31 @@ topology_template: feature_server_oam: - server_oam - 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_oam: - server_oam - disk.write.bytes.rate - network.incoming.bytes.rate_pcm_port_1: - - pcm_port_1 - - network.incoming.bytes.rate + 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_pcm_port_00: + - pcm_port_00 + - dependency local_storage_server_oam: - server_oam - 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_oam: - server_oam - - dependency - dependency_pcm_port_1: - - pcm_port_1 - - dependency + - 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/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/in/nested-oam_v0.1.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/in/nested-oam_v0.1.yaml index 77d7e26b21..caf8e405a6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/in/nested-oam_v0.1.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/in/nested-oam_v0.1.yaml @@ -66,10 +66,10 @@ resources: flavor: { get_param: oam_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} - pcm_port_0: + pcm_port_00: type: OS::Neutron::Port properties: network: { get_param: cps_net_name } @@ -77,7 +77,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 } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 2eeae9ad81..cf58502a77 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -577,43 +577,41 @@ node_types: org.openecomp.resource.abstract.nodes.heat.oam_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pcm_port_0_network_role: - type: string - required: true - status: SUPPORTED - port_pcm_port_1_network_role_tag: - type: string - required: true - status: SUPPORTED availabilityzone_name: type: string description: availabilityzone name required: true status: SUPPORTED - port_pcm_port_0_vlan_requirements: + port_pcm_port_00_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pcm_port_01_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements oam_server_name: type: string description: oam server name required: true status: SUPPORTED - port_pcm_port_0_order: - type: integer + port_pcm_port_00_subnetpoolid: + type: string required: true status: SUPPORTED - port_pcm_port_0_subnetpoolid: - type: string + port_pcm_port_01_vlan_requirements: + type: list required: true status: SUPPORTED - port_pcm_port_1_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pcm_port_01_network_role: type: string required: true status: SUPPORTED - port_pcm_port_0_network_role_tag: + port_pcm_port_01_subnetpoolid: type: string required: true status: SUPPORTED @@ -627,24 +625,20 @@ node_types: description: CPS network mask required: true status: SUPPORTED - port_pcm_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pcm_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED oam_net_name: type: string description: OAM network name required: true status: SUPPORTED - port_pcm_port_1_network_role: + port_pcm_port_01_network_role_tag: type: string required: true status: SUPPORTED - port_pcm_port_0_ip_requirements: + port_pcm_port_00_network_role: + type: string + required: true + status: SUPPORTED + port_pcm_port_00_ip_requirements: type: list required: true status: SUPPORTED @@ -670,31 +664,37 @@ node_types: description: CPS network ip required: true status: SUPPORTED - port_pcm_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pcm_port_00_network_role_tag: + type: string required: true status: SUPPORTED - port_pcm_port_1_vlan_requirements: - type: list + port_pcm_port_01_order: + type: integer + required: true + status: SUPPORTED + port_pcm_port_00_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pcm_port_00_order: + type: integer + required: true + status: SUPPORTED + port_pcm_port_01_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements pcm_vol: type: string description: CPS Cluman Cinder Volume required: true status: SUPPORTED - port_pcm_port_1_ip_requirements: + port_pcm_port_00_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.VlanRequirements cps_net_name: type: string description: CPS network name @@ -710,8 +710,8 @@ node_types: description: CPS network mask required: true status: SUPPORTED - port_pcm_port_1_order: - type: integer + port_pcm_port_01_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED attributes: @@ -734,27 +734,27 @@ node_types: occurrences: - 0 - UNBOUNDED - - 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_pcm_port_0: + - dependency_pcm_port_01: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_port_0: + - link_pcm_port_01: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -767,37 +767,35 @@ node_types: occurrences: - 1 - UNBOUNDED - 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. + 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: + memory_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory_server_oam: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pcm_port_01: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pcm_port_0: + disk.write.requests_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests_server_oam: + 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: @@ -815,154 +813,136 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_server_oam: + 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.allocation_server_oam: + 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.usage_server_oam: + disk.device.write.requests_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.usage_server_oam: + 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.write.bytes_server_oam: + disk.allocation_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pcm_port_0: + disk.device.usage_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_server_oam: + disk.usage_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.latency_server_oam: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pcm_port_00: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.root.size_server_oam: + disk.device.write.bytes_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.usage_server_oam: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pcm_port_01: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pcm_port_1: + 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 - 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 - disk.read.bytes_server_oam: + disk.ephemeral.size_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - os_server_oam: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - disk.read.requests_server_oam: + disk.device.latency_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.capacity_server_oam: + disk.root.size_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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_oam: type: org.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.bytes_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_pcm_port_0: - type: tosca.capabilities.Node + os_server_oam: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pcm_port_1: + disk.read.requests_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_pcm_port_0: - type: tosca.capabilities.Attachment + disk.capacity_server_oam: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_pcm_port_1: - type: tosca.capabilities.Attachment + disk.device.read.bytes_server_oam: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_server_oam: + 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: @@ -973,6 +953,12 @@ node_types: occurrences: - 1 - UNBOUNDED + 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 disk.device.read.requests.rate_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1032,55 +1018,69 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu.delta_server_oam: + 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 - host_server_oam: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + 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_oam: + 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 - network.outgoing.bytes.rate_pcm_port_1: + binding_pcm_port_01: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + cpu.delta_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - 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. + host_server_oam: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - binding_server_oam: + 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.outgoing.bytes.rate_pcm_port_0: + disk.device.write.bytes.rate_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_server_oam: + 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_1: + binding_server_oam: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1115,7 +1115,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: @@ -1127,7 +1127,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pcm_port_1: + 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: @@ -1994,4 +1994,4 @@ node_types: type: tosca.capabilities.network.Bindable occurrences: - 1 - - UNBOUNDED + - UNBOUNDED
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml index e49afcd726..e33c8f7742 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml @@ -186,17 +186,19 @@ topology_template: directives: - substitutable properties: - port_pcm_port_1_network_role_tag: oam - availabilityzone_name: - get_input: availabilityzone_name - port_pcm_port_0_ip_requirements: + port_pcm_port_00_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + availabilityzone_name: + get_input: availabilityzone_name oam_net_gw: get_input: oam_net_gw + port_pcm_port_00_mac_requirements: + mac_count_required: + is_required: false oam_flavor_name: get_input: oam_flavor_name security_group_name: @@ -205,29 +207,26 @@ topology_template: get_input: - cps_net_ips - 0 + port_pcm_port_01_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false oam_server_name: get_input: - oam_server_names - 0 - port_pcm_port_1_mac_requirements: - mac_count_required: - is_required: false + port_pcm_port_00_network_role_tag: cps service_template_filter: substitute_service_template: nested-oam_v0.1ServiceTemplate.yaml + port_pcm_port_01_mac_requirements: + mac_count_required: + is_required: false pcm_vol: get_input: - pcm_volumes - 0 - port_pcm_port_1_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_pcm_port_0_network_role_tag: cps - port_pcm_port_0_mac_requirements: - mac_count_required: - is_required: false oam_image_name: get_input: oam_image_name cps_net_name: @@ -242,6 +241,7 @@ topology_template: get_input: oam_net_mask oam_net_name: get_input: oam_net_name + port_pcm_port_01_network_role_tag: oam server_pcm_001: type: org.openecomp.resource.abstract.nodes.heat.pcm_server directives: @@ -408,4 +408,4 @@ topology_template: value: get_attribute: - server_pcm_002 - - server_pcm_id + - server_pcm_id
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml index 815fc7c18d..5abcd8ca3b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml @@ -11,39 +11,38 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pcm_port_0_network_role: - type: string - required: true - port_pcm_port_1_network_role_tag: - type: string - required: true availabilityzone_name: label: availabilityzone name hidden: false immutable: false type: string description: availabilityzone name - port_pcm_port_0_vlan_requirements: + port_pcm_port_00_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pcm_port_01_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements oam_server_name: label: oam server name hidden: false immutable: false type: string description: oam server name - port_pcm_port_0_order: - type: integer - required: true - port_pcm_port_0_subnetpoolid: + port_pcm_port_00_subnetpoolid: type: string required: true - port_pcm_port_1_subnetpoolid: + port_pcm_port_01_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pcm_port_01_network_role: type: string required: true - port_pcm_port_0_network_role_tag: + port_pcm_port_01_subnetpoolid: type: string required: true oam_image_name: @@ -58,22 +57,19 @@ topology_template: immutable: false type: string description: CPS network mask - port_pcm_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pcm_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true oam_net_name: label: OAM network name hidden: false immutable: false type: string description: OAM network name - port_pcm_port_1_network_role: + port_pcm_port_01_network_role_tag: type: string required: true - port_pcm_port_0_ip_requirements: + port_pcm_port_00_network_role: + type: string + required: true + port_pcm_port_00_ip_requirements: type: list required: true entry_schema: @@ -102,28 +98,32 @@ topology_template: immutable: false type: string description: CPS network ip - port_pcm_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pcm_port_00_network_role_tag: + type: string required: true - port_pcm_port_1_vlan_requirements: - type: list + port_pcm_port_01_order: + type: integer + required: true + port_pcm_port_00_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pcm_port_00_order: + type: integer + required: true + port_pcm_port_01_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements pcm_vol: label: CPS Cluman Cinder Volume hidden: false immutable: false type: string description: CPS Cluman Cinder Volume - port_pcm_port_1_ip_requirements: + port_pcm_port_00_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true + type: org.openecomp.datatypes.network.VlanRequirements cps_net_name: label: CPS network name hidden: false @@ -142,8 +142,8 @@ topology_template: immutable: false type: string description: CPS network mask - port_pcm_port_1_order: - type: integer + port_pcm_port_01_exCP_naming: + type: org.openecomp.datatypes.Naming required: true node_templates: server_oam: @@ -158,63 +158,63 @@ topology_template: config_drive: true name: get_input: oam_server_name - pcm_port_1: + pcm_port_00: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: - get_input: port_pcm_port_1_ip_requirements + get_input: port_pcm_port_00_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: port_pcm_port_1_network_role + get_input: port_pcm_port_00_network_role fixed_ips: - ip_address: - get_input: oam_net_ip + get_input: cps_net_ip subnetpoolid: - get_input: port_pcm_port_1_subnetpoolid + get_input: port_pcm_port_00_subnetpoolid mac_requirements: - get_input: port_pcm_port_1_mac_requirements + get_input: port_pcm_port_00_mac_requirements exCP_naming: - get_input: port_pcm_port_1_exCP_naming + get_input: port_pcm_port_00_exCP_naming vlan_requirements: - get_input: port_pcm_port_1_vlan_requirements + get_input: port_pcm_port_00_vlan_requirements network_role_tag: - get_input: port_pcm_port_1_network_role_tag + get_input: port_pcm_port_00_network_role_tag network: - get_input: oam_net_name + get_input: cps_net_name order: - get_input: port_pcm_port_1_order + get_input: port_pcm_port_00_order requirements: - binding: capability: tosca.capabilities.network.Bindable node: server_oam relationship: tosca.relationships.network.BindsTo - pcm_port_0: + pcm_port_01: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: - get_input: port_pcm_port_0_ip_requirements + get_input: port_pcm_port_01_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: port_pcm_port_0_network_role + get_input: port_pcm_port_01_network_role fixed_ips: - ip_address: - get_input: cps_net_ip + get_input: oam_net_ip subnetpoolid: - get_input: port_pcm_port_0_subnetpoolid + get_input: port_pcm_port_01_subnetpoolid mac_requirements: - get_input: port_pcm_port_0_mac_requirements + get_input: port_pcm_port_01_mac_requirements exCP_naming: - get_input: port_pcm_port_0_exCP_naming + get_input: port_pcm_port_01_exCP_naming vlan_requirements: - get_input: port_pcm_port_0_vlan_requirements + get_input: port_pcm_port_01_vlan_requirements network_role_tag: - get_input: port_pcm_port_0_network_role_tag + get_input: port_pcm_port_01_network_role_tag network: - get_input: cps_net_name + get_input: oam_net_name order: - get_input: port_pcm_port_0_order + get_input: port_pcm_port_01_order requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -228,8 +228,8 @@ topology_template: description: heat template that creates PCRF Cluman stack members: - server_oam - - pcm_port_1 - - pcm_port_0 + - pcm_port_00 + - pcm_port_01 outputs: server_oam_id: description: the oam nova service id @@ -240,33 +240,42 @@ topology_template: cpu_server_oam: - server_oam - cpu - network.incoming.packets.rate_pcm_port_0: - - pcm_port_0 - - network.incoming.packets.rate - 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 + network.incoming.packets_pcm_port_01: + - pcm_port_01 + - network.incoming.packets memory_server_oam: - server_oam - memory - network.outpoing.packets_pcm_port_0: - - pcm_port_0 - - network.outpoing.packets + feature_pcm_port_01: + - pcm_port_01 + - feature disk.write.requests_server_oam: - server_oam - disk.write.requests + network.incoming.packets_pcm_port_00: + - pcm_port_00 + - network.incoming.packets memory.resident_server_oam: - server_oam - memory.resident disk.device.iops_server_oam: - server_oam - disk.device.iops + 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 disk.device.write.requests_server_oam: - server_oam - disk.device.write.requests + network.incoming.bytes_pcm_port_01: + - pcm_port_01 + - network.incoming.bytes disk.allocation_server_oam: - server_oam - disk.allocation @@ -276,12 +285,18 @@ topology_template: disk.usage_server_oam: - server_oam - disk.usage + attachment_pcm_port_00: + - pcm_port_00 + - attachment disk.device.write.bytes_server_oam: - server_oam - disk.device.write.bytes - network.incoming.bytes_pcm_port_0: - - pcm_port_0 - - network.incoming.bytes + attachment_pcm_port_01: + - pcm_port_01 + - attachment + network.outgoing.bytes_pcm_port_00: + - pcm_port_00 + - network.outgoing.bytes disk.ephemeral.size_server_oam: - server_oam - disk.ephemeral.size @@ -291,18 +306,15 @@ topology_template: disk.root.size_server_oam: - server_oam - disk.root.size + network.outgoing.packets.rate_pcm_port_01: + - pcm_port_01 + - network.outgoing.packets.rate memory.usage_server_oam: - server_oam - memory.usage - 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.bytes_pcm_port_01: + - pcm_port_01 + - network.outgoing.bytes disk.read.bytes_server_oam: - server_oam - disk.read.bytes @@ -315,36 +327,18 @@ topology_template: disk.capacity_server_oam: - server_oam - disk.capacity - 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 - 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 disk.device.read.bytes_server_oam: - server_oam - disk.device.read.bytes + network.incoming.bytes.rate_pcm_port_00: + - pcm_port_00 + - network.incoming.bytes.rate endpoint_server_oam: - server_oam - endpoint + network.incoming.bytes.rate_pcm_port_01: + - pcm_port_01 + - network.incoming.bytes.rate disk.device.read.requests.rate_server_oam: - server_oam - disk.device.read.requests.rate @@ -375,33 +369,39 @@ topology_template: cpu_util_server_oam: - server_oam - 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 cpu.delta_server_oam: - server_oam - cpu.delta host_server_oam: - server_oam - host + binding_pcm_port_00: + - pcm_port_00 + - binding disk.device.write.bytes.rate_server_oam: - server_oam - disk.device.write.bytes.rate - network.outgoing.bytes.rate_pcm_port_1: - - pcm_port_1 + network.outgoing.bytes.rate_pcm_port_00: + - pcm_port_00 - network.outgoing.bytes.rate - network.incoming.packets_pcm_port_0: - - pcm_port_0 - - network.incoming.packets binding_server_oam: - server_oam - binding - network.outgoing.bytes.rate_pcm_port_0: - - pcm_port_0 - - network.outgoing.bytes.rate disk.device.capacity_server_oam: - server_oam - disk.device.capacity - network.incoming.packets_pcm_port_1: - - pcm_port_1 - - network.incoming.packets disk.latency_server_oam: - server_oam - disk.latency @@ -417,31 +417,31 @@ topology_template: feature_server_oam: - server_oam - 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_oam: - server_oam - disk.write.bytes.rate - network.incoming.bytes.rate_pcm_port_1: - - pcm_port_1 - - network.incoming.bytes.rate + 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_pcm_port_00: + - pcm_port_00 + - dependency local_storage_server_oam: - server_oam - 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_oam: - server_oam - - dependency - dependency_pcm_port_1: - - pcm_port_1 - - dependency + - 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/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/in/nested-pcm_v0.2.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/in/nested-pcm_v0.2.yaml index 01f875739a..3cf127562e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/in/nested-pcm_v0.2.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/in/nested-pcm_v0.2.yaml @@ -57,7 +57,7 @@ parameters: description: the name of security group resources: - server_pcm: + server_pcm_1: type: OS::Nova::Server properties: config_drive: "True" @@ -66,14 +66,14 @@ 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_01} + - port: { get_resource: pcm_port_11} block_device_mapping: - device_name: vdb volume_id: { get_param: pcm_vol} user_data_format: RAW - pcm_port_0: + pcm_port_01: type: OS::Neutron::Port properties: network: { get_param: cps_net_name } @@ -81,7 +81,7 @@ resources: - ip_address: { get_param: cps_net_ip } security_groups: [{ get_param: security_group_name }] - pcm_port_1: + pcm_port_11: type: OS::Neutron::Port properties: network: { get_param: oam_net_name } @@ -91,4 +91,4 @@ resources: 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/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/in/nested-pcm_v0.3.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/in/nested-pcm_v0.3.yaml index 01f875739a..53b7b2001c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/in/nested-pcm_v0.3.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/in/nested-pcm_v0.3.yaml @@ -57,7 +57,7 @@ parameters: description: the name of security group resources: - server_pcm: + server_pcm_2: type: OS::Nova::Server properties: config_drive: "True" @@ -66,14 +66,14 @@ 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_02} + - port: { get_resource: pcm_port_12} block_device_mapping: - device_name: vdb volume_id: { get_param: pcm_vol} user_data_format: RAW - pcm_port_0: + pcm_port_02: type: OS::Neutron::Port properties: network: { get_param: cps_net_name } @@ -81,7 +81,7 @@ resources: - ip_address: { get_param: cps_net_ip } security_groups: [{ get_param: security_group_name }] - pcm_port_1: + pcm_port_12: type: OS::Neutron::Port properties: network: { get_param: oam_net_name } @@ -91,4 +91,4 @@ resources: 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/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml index c1c907fb3d..2ebfbde147 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,11 +8,7 @@ node_types: org.openecomp.resource.abstract.nodes.heat.pcm_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pcm_port_0_network_role: - type: string - required: true - status: SUPPORTED - port_pcm_port_1_network_role_tag: + port_pcm_port_11_network_role_tag: type: string required: true status: SUPPORTED @@ -21,30 +17,38 @@ node_types: description: availabilityzone name required: true status: SUPPORTED - port_pcm_port_0_vlan_requirements: + port_pcm_port_11_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements pcm_image_name: type: string description: PCRF CM image name required: true status: SUPPORTED - port_pcm_port_0_order: - type: integer + port_pcm_port_01_ip_requirements: + type: list required: true status: SUPPORTED - port_pcm_port_0_subnetpoolid: - type: string + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_01_vlan_requirements: + type: list required: true status: SUPPORTED - port_pcm_port_1_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pcm_port_11_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pcm_port_01_network_role: type: string required: true status: SUPPORTED - port_pcm_port_0_network_role_tag: + port_pcm_port_01_subnetpoolid: type: string required: true status: SUPPORTED @@ -58,72 +62,64 @@ node_types: description: CPS network mask required: true status: SUPPORTED - port_pcm_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pcm_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED oam_net_name: type: string description: OAM network name required: true status: SUPPORTED - port_pcm_port_1_network_role: + port_pcm_port_01_network_role_tag: type: string required: true status: SUPPORTED - port_pcm_port_0_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements oam_net_gw: type: string description: CPS network gateway required: true status: SUPPORTED + port_pcm_port_11_network_role: + type: string + required: true + status: SUPPORTED security_group_name: type: string description: the name of security group required: true status: SUPPORTED + port_pcm_port_11_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements cps_net_ip: type: string description: CPS network ip required: true status: SUPPORTED - port_pcm_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pcm_port_11_order: + type: integer required: true status: SUPPORTED - port_pcm_port_1_vlan_requirements: - type: list + port_pcm_port_01_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements pcm_flavor_name: type: string description: flavor name of PCRF CM instance required: true status: SUPPORTED + port_pcm_port_01_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED pcm_vol: type: string description: CPS Cluman Cinder Volume required: true status: SUPPORTED - port_pcm_port_1_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pcm_port_11_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED cps_net_name: @@ -141,8 +137,12 @@ node_types: description: CPS network mask required: true status: SUPPORTED - port_pcm_port_1_order: - type: integer + port_pcm_port_01_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pcm_port_11_subnetpoolid: + type: string required: true status: SUPPORTED attributes: @@ -151,414 +151,414 @@ node_types: description: the pcm nova service id status: SUPPORTED requirements: - - dependency_pcm_port_1: + - dependency_pcm_port_11: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_port_1: + - link_pcm_port_11: 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: + network.outgoing.bytes_pcm_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.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: + 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 - disk.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 - network.outpoing.packets_pcm_port_0: + 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.iops_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 - memory.resident_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.device.write.requests_server_pcm: + network.incoming.bytes.rate_pcm_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.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.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. + attachment_pcm_port_01: + type: tosca.capabilities.Attachment 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_pcm_port_11: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_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 - disk.root.size_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 - 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 - disk.device.latency_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 - network.incoming.bytes_pcm_port_0: + 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 - network.incoming.bytes_pcm_port_1: + 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 - 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: + network.outgoing.packets.rate_pcm_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.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. + feature_server_pcm_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.capacity_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 - os_server_pcm: - type: tosca.capabilities.OperatingSystem + 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 - disk.read.bytes_server_pcm: + 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 - network.outgoing.packets.rate_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 - network.outgoing.packets.rate_pcm_port_1: + network.incoming.packets.rate_pcm_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 - feature_pcm_port_1: - type: tosca.capabilities.Node + binding_pcm_port_11: + 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: + 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 - disk.device.read.bytes_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 - feature_pcm_port_0: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes_pcm_port_1: + network.outgoing.bytes.rate_pcm_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 - attachment_pcm_port_0: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - attachment_pcm_port_1: + attachment_pcm_port_11: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - endpoint_server_pcm: + endpoint_server_pcm_1: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_server_pcm: + 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 - vcpus_server_pcm: + 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.write.bytes_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 - disk.iops_server_pcm: + host_server_pcm_1: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent + occurrences: + - 1 + - UNBOUNDED + 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.read.bytes.rate_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.device.allocation_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 - scalable_server_pcm: - type: tosca.capabilities.Scalable + 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 - disk.device.read.bytes.rate_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 - cpu_util_server_pcm: + network.outpoing.packets_pcm_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.write.requests.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 - disk.device.write.bytes.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 - 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: + - 0 + - UNBOUNDED + scalable_server_pcm_1: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - cpu.delta_server_pcm: + 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 - network.outgoing.bytes.rate_pcm_port_1: + 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.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: + network.incoming.packets_pcm_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.capacity_server_pcm: + 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 - network.incoming.packets_pcm_port_1: + 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 - instance_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.device.write.requests.rate_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.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 - feature_server_pcm: - type: tosca.capabilities.Node + network.incoming.bytes_pcm_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.bytes.rate_pcm_port_0: + os_server_pcm_1: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + binding_server_pcm_1: + type: tosca.capabilities.network.Bindable + 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: - 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: @@ -567,43 +567,49 @@ node_types: org.openecomp.resource.abstract.nodes.heat.pcm_server_2: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pcm_port_0_network_role: - type: string - required: true - status: SUPPORTED - port_pcm_port_1_network_role_tag: - type: string + port_pcm_port_02_order: + type: integer required: true status: SUPPORTED - availabilityzone_name: - type: string - description: availabilityzone name + port_pcm_port_12_vlan_requirements: + type: list required: true status: SUPPORTED - port_pcm_port_0_vlan_requirements: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pcm_port_02_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - pcm_image_name: + availabilityzone_name: type: string - description: PCRF CM image name + description: availabilityzone name required: true status: SUPPORTED - port_pcm_port_0_order: + port_pcm_port_12_order: type: integer required: true status: SUPPORTED - port_pcm_port_0_subnetpoolid: + port_pcm_port_02_network_role: type: string required: true status: SUPPORTED - port_pcm_port_1_subnetpoolid: + pcm_image_name: type: string + description: PCRF CM image name required: true status: SUPPORTED - port_pcm_port_0_network_role_tag: + port_pcm_port_02_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pcm_port_12_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pcm_port_02_subnetpoolid: type: string required: true status: SUPPORTED @@ -617,29 +623,19 @@ node_types: description: CPS network mask required: true status: SUPPORTED - port_pcm_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pcm_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED oam_net_name: type: string description: OAM network name required: true status: SUPPORTED - port_pcm_port_1_network_role: + port_pcm_port_12_network_role: type: string required: true status: SUPPORTED - port_pcm_port_0_ip_requirements: - type: list + port_pcm_port_02_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements oam_net_gw: type: string description: CPS network gateway @@ -655,34 +651,28 @@ node_types: description: CPS network ip required: true status: SUPPORTED - port_pcm_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pcm_port_1_vlan_requirements: + port_pcm_port_12_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements pcm_flavor_name: type: string description: flavor name of PCRF CM instance required: true status: SUPPORTED - pcm_vol: + port_pcm_port_12_subnetpoolid: type: string - description: CPS Cluman Cinder Volume required: true status: SUPPORTED - port_pcm_port_1_ip_requirements: - type: list + pcm_vol: + type: string + description: CPS Cluman Cinder Volume required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pcm_port_02_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED cps_net_name: @@ -700,424 +690,434 @@ node_types: description: CPS network mask required: true status: SUPPORTED - port_pcm_port_1_order: - type: integer + port_pcm_port_12_network_role_tag: + type: string required: true status: SUPPORTED + port_pcm_port_12_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pcm_port_02_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements attributes: server_pcm_id: type: string description: the pcm nova service id status: SUPPORTED requirements: - - dependency_pcm_port_1: + - dependency_pcm_port_12: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_port_1: + - link_pcm_port_12: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_server_pcm: + - dependency_pcm_port_02: 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_02: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_pcm_port_0: + - 1 + - 1 + - dependency_server_pcm_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 + - local_storage_server_pcm_2: + 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_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_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: - 1 - UNBOUNDED - network.incoming.packets.rate_pcm_port_1: + network.incoming.packets_pcm_port_02: type: org.openecomp.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_02: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - memory_server_pcm: + network.outgoing.bytes_pcm_port_12: type: org.openecomp.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.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 - network.outpoing.packets_pcm_port_0: + 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.iops_server_pcm: + network.incoming.bytes_pcm_port_02: type: org.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.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.write.requests_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.device.usage_server_pcm: + network.incoming.bytes.rate_pcm_port_12: type: org.openecomp.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. + attachment_pcm_port_02: + type: tosca.capabilities.Attachment 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. + feature_pcm_port_12: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.root.size_server_pcm: + network.outgoing.packets.rate_pcm_port_02: type: org.openecomp.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_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_pcm: + 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_0: + 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: - 1 - UNBOUNDED - network.incoming.bytes_pcm_port_1: + network.outgoing.bytes_pcm_port_02: type: org.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: + 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: - 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_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.capacity_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 - os_server_pcm: - type: tosca.capabilities.OperatingSystem + 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 - disk.read.bytes_server_pcm: + 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: - 1 - UNBOUNDED - network.outgoing.packets.rate_pcm_port_0: + network.outgoing.bytes.rate_pcm_port_12: type: org.openecomp.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: + network.incoming.packets.rate_pcm_port_12: type: org.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 + binding_pcm_port_12: + 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: + 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.bytes_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 - feature_pcm_port_0: - type: tosca.capabilities.Node + network.incoming.bytes.rate_pcm_port_02: + type: org.openecomp.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: - 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 - attachment_pcm_port_0: - type: tosca.capabilities.Attachment + endpoint_server_pcm_2: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - attachment_pcm_port_1: - type: tosca.capabilities.Attachment + 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 - endpoint_server_pcm: - type: tosca.capabilities.Endpoint.Admin + attachment_pcm_port_12: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_server_pcm: + network.outgoing.packets.rate_pcm_port_12: type: org.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: + 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.write.bytes_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.iops_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 - disk.read.bytes.rate_server_pcm: + 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.allocation_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 - scalable_server_pcm: - type: tosca.capabilities.Scalable + 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.device.read.bytes.rate_server_pcm: + network.outgoing.bytes.rate_pcm_port_02: type: org.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.outpoing.packets_pcm_port_12: type: org.openecomp.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_02: type: org.openecomp.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: + 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 - host_server_pcm: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + scalable_server_pcm_2: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - cpu.delta_server_pcm: + binding_pcm_port_02: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - 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 - network.outgoing.bytes.rate_pcm_port_1: + 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 - network.incoming.packets_pcm_port_0: + 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: - 1 - UNBOUNDED - binding_server_pcm: - type: tosca.capabilities.network.Bindable + network.incoming.packets_pcm_port_12: + type: org.openecomp.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_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_server_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: - 1 - UNBOUNDED - network.incoming.packets_pcm_port_1: + 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 - instance_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.device.write.requests.rate_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.latency_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 - disk.device.read.requests_server_pcm: + 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 - feature_server_pcm: - type: tosca.capabilities.Node + network.incoming.bytes_pcm_port_12: + type: org.openecomp.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: + network.outpoing.packets_pcm_port_02: type: org.openecomp.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_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_pcm_port_1: + binding_server_pcm_2: + type: tosca.capabilities.network.Bindable + 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: @@ -1681,4 +1681,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED + - UNBOUNDED
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/MainServiceTemplate.yaml index 976be29e67..5d4a7a4a82 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/MainServiceTemplate.yaml @@ -61,12 +61,12 @@ topology_template: properties: pcm_flavor_name: get_input: pcm_flavor_name + port_pcm_port_11_network_role_tag: oam service_template_filter: substitute_service_template: nested-pcm_v0.2ServiceTemplate.yaml - port_pcm_port_1_network_role_tag: oam availabilityzone_name: get_input: availabilityzone_name - port_pcm_port_0_ip_requirements: + port_pcm_port_11_ip_requirements: - ip_version: 4 ip_count_required: is_required: true @@ -74,23 +74,23 @@ topology_template: is_required: false pcm_image_name: get_input: pcm_image_name - port_pcm_port_1_mac_requirements: + port_pcm_port_01_mac_requirements: mac_count_required: is_required: false - port_pcm_port_1_ip_requirements: + port_pcm_port_01_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pcm_port_0_network_role_tag: cps - port_pcm_port_0_mac_requirements: + port_pcm_port_11_mac_requirements: mac_count_required: is_required: false pcm_server_name: get_input: - pcm_server_names - 0 + port_pcm_port_01_network_role_tag: cps server_pcm_001: type: org.openecomp.resource.abstract.nodes.heat.pcm_server_1 directives: @@ -137,34 +137,34 @@ topology_template: get_input: pcm_flavor_name service_template_filter: substitute_service_template: nested-pcm_v0.3ServiceTemplate.yaml - port_pcm_port_1_network_role_tag: oam + port_pcm_port_12_mac_requirements: + mac_count_required: + is_required: false availabilityzone_name: get_input: availabilityzone_name - port_pcm_port_0_ip_requirements: + port_pcm_port_02_mac_requirements: + mac_count_required: + is_required: false + pcm_image_name: + get_input: pcm_image_name + port_pcm_port_02_network_role_tag: cps + pcm_server_name: + get_input: + - pcm_server_names + - 0 + port_pcm_port_12_network_role_tag: oam + port_pcm_port_12_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - pcm_image_name: - get_input: pcm_image_name - port_pcm_port_1_mac_requirements: - mac_count_required: - is_required: false - port_pcm_port_1_ip_requirements: + port_pcm_port_02_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pcm_port_0_network_role_tag: cps - port_pcm_port_0_mac_requirements: - mac_count_required: - is_required: false - pcm_server_name: - get_input: - - pcm_server_names - - 0 compute_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: @@ -189,4 +189,4 @@ topology_template: - server_pcm_002 - server_pcm_001 - server_pcm_003 - - compute_port_0 + - compute_port_0
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml index 0fbb5e3cd9..57edbcf4aa 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml @@ -11,10 +11,7 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pcm_port_0_network_role: - type: string - required: true - port_pcm_port_1_network_role_tag: + port_pcm_port_11_network_role_tag: type: string required: true availabilityzone_name: @@ -23,27 +20,34 @@ topology_template: immutable: false type: string description: availabilityzone name - port_pcm_port_0_vlan_requirements: + port_pcm_port_11_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements pcm_image_name: label: image name hidden: false immutable: false type: string description: PCRF CM image name - port_pcm_port_0_order: - type: integer + port_pcm_port_01_ip_requirements: + type: list required: true - port_pcm_port_0_subnetpoolid: - type: string + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_01_vlan_requirements: + type: list required: true - port_pcm_port_1_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pcm_port_11_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pcm_port_01_network_role: type: string required: true - port_pcm_port_0_network_role_tag: + port_pcm_port_01_subnetpoolid: type: string required: true pcm_server_name: @@ -58,71 +62,64 @@ topology_template: immutable: false type: string description: CPS network mask - port_pcm_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pcm_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true oam_net_name: label: OAM network name hidden: false immutable: false type: string description: OAM network name - port_pcm_port_1_network_role: + port_pcm_port_01_network_role_tag: type: string required: true - port_pcm_port_0_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements oam_net_gw: label: CPS network gateway hidden: false immutable: false type: string description: CPS network gateway + port_pcm_port_11_network_role: + type: string + required: true security_group_name: label: security group name hidden: false immutable: false type: string description: the name of security group + port_pcm_port_11_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements cps_net_ip: label: CPS network ip hidden: false immutable: false type: string description: CPS network ip - port_pcm_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pcm_port_11_order: + type: integer required: true - port_pcm_port_1_vlan_requirements: - type: list + port_pcm_port_01_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements pcm_flavor_name: label: PCRF CM flavor name hidden: false immutable: false type: string description: flavor name of PCRF CM instance + port_pcm_port_01_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true pcm_vol: label: CPS Cluman Cinder Volume hidden: false immutable: false type: string description: CPS Cluman Cinder Volume - port_pcm_port_1_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pcm_port_11_exCP_naming: + type: org.openecomp.datatypes.Naming required: true cps_net_name: label: CPS network name @@ -142,85 +139,88 @@ topology_template: immutable: false type: string description: CPS network mask - port_pcm_port_1_order: - type: integer + port_pcm_port_01_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pcm_port_11_subnetpoolid: + type: string required: true node_templates: - pcm_port_1: + pcm_port_11: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: - get_input: port_pcm_port_1_ip_requirements + get_input: port_pcm_port_11_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: port_pcm_port_1_network_role + get_input: port_pcm_port_11_network_role fixed_ips: - ip_address: get_input: oam_net_ip subnetpoolid: - get_input: port_pcm_port_1_subnetpoolid + get_input: port_pcm_port_11_subnetpoolid mac_requirements: - get_input: port_pcm_port_1_mac_requirements + get_input: port_pcm_port_11_mac_requirements exCP_naming: - get_input: port_pcm_port_1_exCP_naming + get_input: port_pcm_port_11_exCP_naming vlan_requirements: - get_input: port_pcm_port_1_vlan_requirements + get_input: port_pcm_port_11_vlan_requirements network_role_tag: - get_input: port_pcm_port_1_network_role_tag + get_input: port_pcm_port_11_network_role_tag network: get_input: oam_net_name order: - get_input: port_pcm_port_1_order + get_input: port_pcm_port_11_order 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.compute.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: - get_input: port_pcm_port_0_ip_requirements + get_input: port_pcm_port_01_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: port_pcm_port_0_network_role + get_input: port_pcm_port_01_network_role fixed_ips: - ip_address: get_input: cps_net_ip subnetpoolid: - get_input: port_pcm_port_0_subnetpoolid + get_input: port_pcm_port_01_subnetpoolid mac_requirements: - get_input: port_pcm_port_0_mac_requirements + get_input: port_pcm_port_01_mac_requirements exCP_naming: - get_input: port_pcm_port_0_exCP_naming + get_input: port_pcm_port_01_exCP_naming vlan_requirements: - get_input: port_pcm_port_0_vlan_requirements + get_input: port_pcm_port_01_vlan_requirements network_role_tag: - get_input: port_pcm_port_0_network_role_tag + get_input: port_pcm_port_01_network_role_tag network: get_input: cps_net_name order: - get_input: port_pcm_port_0_order + get_input: port_pcm_port_01_order 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.compute.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.2_group: type: org.openecomp.groups.heat.HeatStack @@ -228,221 +228,221 @@ topology_template: heat_file: ../Artifacts/nested-pcm_v0.2.yaml description: heat template that creates PCRF Cluman stack members: - - pcm_port_1 - - server_pcm - - pcm_port_0 + - pcm_port_11 + - 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.pcm_server 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 - - network.incoming.bytes - network.incoming.bytes_pcm_port_1: - - pcm_port_1 + network.outgoing.bytes_pcm_port_11: + - pcm_port_11 + - network.outgoing.bytes + network.incoming.packets_pcm_port_01: + - pcm_port_01 + - network.incoming.packets + feature_pcm_port_01: + - pcm_port_01 + - feature + 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.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 + network.incoming.bytes.rate_pcm_port_11: + - pcm_port_11 + - network.incoming.bytes.rate + disk.read.bytes_server_pcm_1: + - server_pcm_1 - disk.read.bytes - network.outgoing.packets.rate_pcm_port_0: - - pcm_port_0 + attachment_pcm_port_01: + - pcm_port_01 + - attachment + feature_pcm_port_11: + - pcm_port_11 + - feature + network.outgoing.packets.rate_pcm_port_01: + - pcm_port_01 - network.outgoing.packets.rate - network.outgoing.packets.rate_pcm_port_1: - - pcm_port_1 + 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 + network.outgoing.packets.rate_pcm_port_11: + - pcm_port_11 - network.outgoing.packets.rate - feature_pcm_port_1: - - pcm_port_1 + feature_server_pcm_1: + - server_pcm_1 - feature - network.outgoing.bytes_pcm_port_0: - - pcm_port_0 - - network.outgoing.bytes - disk.device.read.bytes_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.packets.rate_pcm_port_11: + - pcm_port_11 + - network.incoming.packets.rate + binding_pcm_port_11: + - pcm_port_11 + - binding + disk.device.read.bytes_server_pcm_1: + - server_pcm_1 - 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 + network.incoming.bytes.rate_pcm_port_01: + - pcm_port_01 + - network.incoming.bytes.rate + network.outgoing.bytes.rate_pcm_port_11: + - pcm_port_11 + - network.outgoing.bytes.rate + attachment_pcm_port_11: + - pcm_port_11 - attachment - endpoint_server_pcm: - - server_pcm + 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.outpoing.packets_pcm_port_11: + - pcm_port_11 + - network.outpoing.packets + 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 + 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 + memory_server_pcm_1: + - server_pcm_1 + - memory + 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 + network.incoming.packets_pcm_port_11: + - pcm_port_11 + - network.incoming.packets + 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 + network.incoming.bytes_pcm_port_11: + - pcm_port_11 + - network.incoming.bytes + os_server_pcm_1: + - server_pcm_1 + - os + 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_11: + - pcm_port_11 - dependency - dependency_server_pcm: - - server_pcm + dependency_pcm_port_01: + - pcm_port_01 - dependency - dependency_pcm_port_1: - - pcm_port_1 + dependency_server_pcm_1: + - server_pcm_1 - dependency + link_pcm_port_01: + - pcm_port_01 + - link + link_pcm_port_11: + - pcm_port_11 + - 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/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml index 86ec0082f5..a938a898f4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml @@ -11,39 +11,44 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pcm_port_0_network_role: - type: string + port_pcm_port_02_order: + type: integer required: true - port_pcm_port_1_network_role_tag: - type: string + port_pcm_port_12_vlan_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pcm_port_02_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements availabilityzone_name: label: availabilityzone name hidden: false immutable: false type: string description: availabilityzone name - port_pcm_port_0_vlan_requirements: - type: list + port_pcm_port_12_order: + type: integer + required: true + port_pcm_port_02_network_role: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements pcm_image_name: label: image name hidden: false immutable: false type: string description: PCRF CM image name - port_pcm_port_0_order: - type: integer - required: true - port_pcm_port_0_subnetpoolid: + port_pcm_port_02_network_role_tag: type: string required: true - port_pcm_port_1_subnetpoolid: - type: string + port_pcm_port_12_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pcm_port_0_network_role_tag: + port_pcm_port_02_subnetpoolid: type: string required: true pcm_server_name: @@ -58,26 +63,18 @@ topology_template: immutable: false type: string description: CPS network mask - port_pcm_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pcm_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true oam_net_name: label: OAM network name hidden: false immutable: false type: string description: OAM network name - port_pcm_port_1_network_role: + port_pcm_port_12_network_role: type: string required: true - port_pcm_port_0_ip_requirements: - type: list + port_pcm_port_02_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements oam_net_gw: label: CPS network gateway hidden: false @@ -96,33 +93,28 @@ topology_template: immutable: false type: string description: CPS network ip - port_pcm_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pcm_port_1_vlan_requirements: + port_pcm_port_12_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements pcm_flavor_name: label: PCRF CM flavor name hidden: false immutable: false type: string description: flavor name of PCRF CM instance + port_pcm_port_12_subnetpoolid: + type: string + required: true pcm_vol: label: CPS Cluman Cinder Volume hidden: false immutable: false type: string description: CPS Cluman Cinder Volume - port_pcm_port_1_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pcm_port_02_exCP_naming: + type: org.openecomp.datatypes.Naming required: true cps_net_name: label: CPS network name @@ -142,85 +134,93 @@ topology_template: immutable: false type: string description: CPS network mask - port_pcm_port_1_order: - type: integer + port_pcm_port_12_network_role_tag: + type: string required: true + port_pcm_port_12_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pcm_port_02_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements node_templates: - pcm_port_1: + pcm_port_12: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: - get_input: port_pcm_port_1_ip_requirements + get_input: port_pcm_port_12_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: port_pcm_port_1_network_role + get_input: port_pcm_port_12_network_role fixed_ips: - ip_address: get_input: oam_net_ip subnetpoolid: - get_input: port_pcm_port_1_subnetpoolid + get_input: port_pcm_port_12_subnetpoolid mac_requirements: - get_input: port_pcm_port_1_mac_requirements + get_input: port_pcm_port_12_mac_requirements exCP_naming: - get_input: port_pcm_port_1_exCP_naming + get_input: port_pcm_port_12_exCP_naming vlan_requirements: - get_input: port_pcm_port_1_vlan_requirements + get_input: port_pcm_port_12_vlan_requirements network_role_tag: - get_input: port_pcm_port_1_network_role_tag + get_input: port_pcm_port_12_network_role_tag network: get_input: oam_net_name order: - get_input: port_pcm_port_1_order + get_input: port_pcm_port_12_order requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_pcm + node: server_pcm_2 relationship: tosca.relationships.network.BindsTo - server_pcm: - type: org.openecomp.resource.vfc.compute.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_02: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: - get_input: port_pcm_port_0_ip_requirements + get_input: port_pcm_port_02_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: port_pcm_port_0_network_role + get_input: port_pcm_port_02_network_role fixed_ips: - ip_address: get_input: cps_net_ip subnetpoolid: - get_input: port_pcm_port_0_subnetpoolid + get_input: port_pcm_port_02_subnetpoolid mac_requirements: - get_input: port_pcm_port_0_mac_requirements + get_input: port_pcm_port_02_mac_requirements exCP_naming: - get_input: port_pcm_port_0_exCP_naming + get_input: port_pcm_port_02_exCP_naming vlan_requirements: - get_input: port_pcm_port_0_vlan_requirements + get_input: port_pcm_port_02_vlan_requirements network_role_tag: - get_input: port_pcm_port_0_network_role_tag + get_input: port_pcm_port_02_network_role_tag network: get_input: cps_net_name order: - get_input: port_pcm_port_0_order + get_input: port_pcm_port_02_order requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_pcm + node: server_pcm_2 relationship: tosca.relationships.network.BindsTo + server_pcm_2: + type: org.openecomp.resource.vfc.compute.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.3_group: type: org.openecomp.groups.heat.HeatStack @@ -228,221 +228,221 @@ topology_template: heat_file: ../Artifacts/nested-pcm_v0.3.yaml description: heat template that creates PCRF Cluman stack members: - - pcm_port_1 - - server_pcm - - pcm_port_0 + - pcm_port_12 + - pcm_port_02 + - server_pcm_2 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.pcm_server_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 - 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_2: + - server_pcm_2 - 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 - - network.incoming.bytes - network.incoming.bytes_pcm_port_1: - - pcm_port_1 + disk.iops_server_pcm_2: + - server_pcm_2 + - disk.iops + network.incoming.packets_pcm_port_02: + - pcm_port_02 + - network.incoming.packets + feature_pcm_port_02: + - pcm_port_02 + - feature + network.outgoing.bytes_pcm_port_12: + - pcm_port_12 + - network.outgoing.bytes + 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 + network.incoming.bytes_pcm_port_02: + - pcm_port_02 - 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_2: + - server_pcm_2 - disk.capacity - os_server_pcm: - - server_pcm - - os - disk.read.bytes_server_pcm: - - server_pcm + disk.write.requests_server_pcm_2: + - server_pcm_2 + - disk.write.requests + network.incoming.bytes.rate_pcm_port_12: + - pcm_port_12 + - network.incoming.bytes.rate + disk.read.bytes_server_pcm_2: + - server_pcm_2 - 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 + attachment_pcm_port_02: + - pcm_port_02 + - attachment + feature_pcm_port_12: + - pcm_port_12 - feature - network.outgoing.bytes_pcm_port_0: - - pcm_port_0 + network.outgoing.packets.rate_pcm_port_02: + - pcm_port_02 + - network.outgoing.packets.rate + 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 + network.outgoing.bytes_pcm_port_02: + - pcm_port_02 - network.outgoing.bytes - disk.device.read.bytes_server_pcm: - - server_pcm - - disk.device.read.bytes - feature_pcm_port_0: - - pcm_port_0 + cpu_server_pcm_2: + - server_pcm_2 + - cpu + feature_server_pcm_2: + - server_pcm_2 - 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.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 + network.outgoing.bytes.rate_pcm_port_12: + - pcm_port_12 + - network.outgoing.bytes.rate + network.incoming.packets.rate_pcm_port_12: + - pcm_port_12 + - network.incoming.packets.rate + binding_pcm_port_12: + - pcm_port_12 + - binding + memory.usage_server_pcm_2: + - server_pcm_2 + - memory.usage + disk.device.read.bytes_server_pcm_2: + - server_pcm_2 + - disk.device.read.bytes + network.incoming.bytes.rate_pcm_port_02: + - pcm_port_02 + - network.incoming.bytes.rate + 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 - - 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 + attachment_pcm_port_12: + - pcm_port_12 + - attachment + network.outgoing.packets.rate_pcm_port_12: + - pcm_port_12 + - network.outgoing.packets.rate + disk.device.capacity_server_pcm_2: + - server_pcm_2 + - disk.device.capacity + cpu.delta_server_pcm_2: + - server_pcm_2 - cpu.delta - network.outgoing.bytes.rate_pcm_port_1: - - pcm_port_1 + 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 + network.outgoing.bytes.rate_pcm_port_02: + - pcm_port_02 - network.outgoing.bytes.rate - network.incoming.packets_pcm_port_0: - - pcm_port_0 - - network.incoming.packets - binding_server_pcm: - - server_pcm + network.outpoing.packets_pcm_port_12: + - pcm_port_12 + - network.outpoing.packets + network.incoming.packets.rate_pcm_port_02: + - pcm_port_02 + - network.incoming.packets.rate + disk.write.requests.rate_server_pcm_2: + - server_pcm_2 + - disk.write.requests.rate + scalable_server_pcm_2: + - server_pcm_2 + - scalable + binding_pcm_port_02: + - pcm_port_02 - 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 + memory_server_pcm_2: + - server_pcm_2 + - memory + disk.device.read.bytes.rate_server_pcm_2: + - server_pcm_2 + - disk.device.read.bytes.rate + disk.device.latency_server_pcm_2: + - server_pcm_2 + - disk.device.latency + network.incoming.packets_pcm_port_12: + - pcm_port_12 - network.incoming.packets - instance_server_pcm: - - server_pcm + disk.device.usage_server_pcm_2: + - server_pcm_2 + - disk.device.usage + disk.device.write.requests_server_pcm_2: + - server_pcm_2 + - disk.device.write.requests + 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 - network.incoming.bytes.rate_pcm_port_0: - - pcm_port_0 - - network.incoming.bytes.rate - disk.write.bytes.rate_server_pcm: - - server_pcm + disk.device.read.requests.rate_server_pcm_2: + - server_pcm_2 + - disk.device.read.requests.rate + network.incoming.bytes_pcm_port_12: + - pcm_port_12 + - network.incoming.bytes + network.outpoing.packets_pcm_port_02: + - pcm_port_02 + - network.outpoing.packets + disk.write.bytes.rate_server_pcm_2: + - server_pcm_2 - disk.write.bytes.rate - network.incoming.bytes.rate_pcm_port_1: - - pcm_port_1 - - network.incoming.bytes.rate + binding_server_pcm_2: + - server_pcm_2 + - binding + disk.device.allocation_server_pcm_2: + - server_pcm_2 + - 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_02: + - pcm_port_02 - dependency - dependency_server_pcm: - - server_pcm + dependency_server_pcm_2: + - server_pcm_2 - dependency - dependency_pcm_port_1: - - pcm_port_1 + dependency_pcm_port_12: + - pcm_port_12 - dependency + link_pcm_port_12: + - pcm_port_12 + - link + link_pcm_port_02: + - pcm_port_02 + - link + 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/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/in/nested-pcm_v0.1.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/in/nested-pcm_v0.1.yaml index 01f875739a..3cf127562e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/in/nested-pcm_v0.1.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/in/nested-pcm_v0.1.yaml @@ -57,7 +57,7 @@ parameters: description: the name of security group resources: - server_pcm: + server_pcm_1: type: OS::Nova::Server properties: config_drive: "True" @@ -66,14 +66,14 @@ 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_01} + - port: { get_resource: pcm_port_11} block_device_mapping: - device_name: vdb volume_id: { get_param: pcm_vol} user_data_format: RAW - pcm_port_0: + pcm_port_01: type: OS::Neutron::Port properties: network: { get_param: cps_net_name } @@ -81,7 +81,7 @@ resources: - ip_address: { get_param: cps_net_ip } security_groups: [{ get_param: security_group_name }] - pcm_port_1: + pcm_port_11: type: OS::Neutron::Port properties: network: { get_param: oam_net_name } @@ -91,4 +91,4 @@ resources: 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/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml index c1c907fb3d..0c714840ed 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,11 +8,7 @@ node_types: org.openecomp.resource.abstract.nodes.heat.pcm_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pcm_port_0_network_role: - type: string - required: true - status: SUPPORTED - port_pcm_port_1_network_role_tag: + port_pcm_port_11_network_role_tag: type: string required: true status: SUPPORTED @@ -21,30 +17,38 @@ node_types: description: availabilityzone name required: true status: SUPPORTED - port_pcm_port_0_vlan_requirements: + port_pcm_port_11_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements pcm_image_name: type: string description: PCRF CM image name required: true status: SUPPORTED - port_pcm_port_0_order: - type: integer + port_pcm_port_01_ip_requirements: + type: list required: true status: SUPPORTED - port_pcm_port_0_subnetpoolid: - type: string + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_01_vlan_requirements: + type: list required: true status: SUPPORTED - port_pcm_port_1_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pcm_port_11_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pcm_port_01_network_role: type: string required: true status: SUPPORTED - port_pcm_port_0_network_role_tag: + port_pcm_port_01_subnetpoolid: type: string required: true status: SUPPORTED @@ -58,72 +62,64 @@ node_types: description: CPS network mask required: true status: SUPPORTED - port_pcm_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pcm_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED oam_net_name: type: string description: OAM network name required: true status: SUPPORTED - port_pcm_port_1_network_role: + port_pcm_port_01_network_role_tag: type: string required: true status: SUPPORTED - port_pcm_port_0_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements oam_net_gw: type: string description: CPS network gateway required: true status: SUPPORTED + port_pcm_port_11_network_role: + type: string + required: true + status: SUPPORTED security_group_name: type: string description: the name of security group required: true status: SUPPORTED + port_pcm_port_11_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements cps_net_ip: type: string description: CPS network ip required: true status: SUPPORTED - port_pcm_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pcm_port_11_order: + type: integer required: true status: SUPPORTED - port_pcm_port_1_vlan_requirements: - type: list + port_pcm_port_01_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements pcm_flavor_name: type: string description: flavor name of PCRF CM instance required: true status: SUPPORTED + port_pcm_port_01_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED pcm_vol: type: string description: CPS Cluman Cinder Volume required: true status: SUPPORTED - port_pcm_port_1_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pcm_port_11_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED cps_net_name: @@ -141,8 +137,12 @@ node_types: description: CPS network mask required: true status: SUPPORTED - port_pcm_port_1_order: - type: integer + port_pcm_port_01_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pcm_port_11_subnetpoolid: + type: string required: true status: SUPPORTED attributes: @@ -151,414 +151,414 @@ node_types: description: the pcm nova service id status: SUPPORTED requirements: - - dependency_pcm_port_1: + - dependency_pcm_port_11: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_port_1: + - link_pcm_port_11: 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: + network.outgoing.bytes_pcm_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.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: + 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 - disk.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 - network.outpoing.packets_pcm_port_0: + 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.iops_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 - memory.resident_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.device.write.requests_server_pcm: + network.incoming.bytes.rate_pcm_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.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.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. + attachment_pcm_port_01: + type: tosca.capabilities.Attachment 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_pcm_port_11: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_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 - disk.root.size_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 - 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 - disk.device.latency_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 - network.incoming.bytes_pcm_port_0: + 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 - network.incoming.bytes_pcm_port_1: + 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 - 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: + network.outgoing.packets.rate_pcm_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.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. + feature_server_pcm_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.capacity_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 - os_server_pcm: - type: tosca.capabilities.OperatingSystem + 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 - disk.read.bytes_server_pcm: + 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 - network.outgoing.packets.rate_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 - network.outgoing.packets.rate_pcm_port_1: + network.incoming.packets.rate_pcm_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 - feature_pcm_port_1: - type: tosca.capabilities.Node + binding_pcm_port_11: + 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: + 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 - disk.device.read.bytes_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 - feature_pcm_port_0: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes_pcm_port_1: + network.outgoing.bytes.rate_pcm_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 - attachment_pcm_port_0: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - attachment_pcm_port_1: + attachment_pcm_port_11: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - endpoint_server_pcm: + endpoint_server_pcm_1: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_server_pcm: + 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 - vcpus_server_pcm: + 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.write.bytes_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 - disk.iops_server_pcm: + host_server_pcm_1: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent + occurrences: + - 1 + - UNBOUNDED + 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.read.bytes.rate_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.device.allocation_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 - scalable_server_pcm: - type: tosca.capabilities.Scalable + 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 - disk.device.read.bytes.rate_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 - cpu_util_server_pcm: + network.outpoing.packets_pcm_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.write.requests.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 - disk.device.write.bytes.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 - 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: + - 0 + - UNBOUNDED + scalable_server_pcm_1: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - cpu.delta_server_pcm: + 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 - network.outgoing.bytes.rate_pcm_port_1: + 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.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: + network.incoming.packets_pcm_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.capacity_server_pcm: + 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 - network.incoming.packets_pcm_port_1: + 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 - instance_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.device.write.requests.rate_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.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 - feature_server_pcm: - type: tosca.capabilities.Node + network.incoming.bytes_pcm_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.bytes.rate_pcm_port_0: + os_server_pcm_1: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + binding_server_pcm_1: + type: tosca.capabilities.network.Bindable + 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: - 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: @@ -1126,11 +1126,7 @@ node_types: org.openecomp.resource.abstract.nodes.heat.pcm_server_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pcm_port_0_network_role: - type: string - required: true - status: SUPPORTED - port_pcm_port_1_network_role_tag: + port_pcm_port_11_network_role_tag: type: string required: true status: SUPPORTED @@ -1139,30 +1135,38 @@ node_types: description: availabilityzone name required: true status: SUPPORTED - port_pcm_port_0_vlan_requirements: + port_pcm_port_11_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements pcm_image_name: type: string description: PCRF CM image name required: true status: SUPPORTED - port_pcm_port_0_order: - type: integer + port_pcm_port_01_ip_requirements: + type: list required: true status: SUPPORTED - port_pcm_port_0_subnetpoolid: - type: string + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_01_vlan_requirements: + type: list required: true status: SUPPORTED - port_pcm_port_1_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pcm_port_11_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pcm_port_01_network_role: type: string required: true status: SUPPORTED - port_pcm_port_0_network_role_tag: + port_pcm_port_01_subnetpoolid: type: string required: true status: SUPPORTED @@ -1176,72 +1180,64 @@ node_types: description: CPS network mask required: true status: SUPPORTED - port_pcm_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pcm_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED oam_net_name: type: string description: OAM network name required: true status: SUPPORTED - port_pcm_port_1_network_role: + port_pcm_port_01_network_role_tag: type: string required: true status: SUPPORTED - port_pcm_port_0_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements oam_net_gw: type: string description: CPS network gateway required: true status: SUPPORTED + port_pcm_port_11_network_role: + type: string + required: true + status: SUPPORTED security_group_name: type: string description: the name of security group required: true status: SUPPORTED + port_pcm_port_11_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements cps_net_ip: type: string description: CPS network ip required: true status: SUPPORTED - port_pcm_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pcm_port_11_order: + type: integer required: true status: SUPPORTED - port_pcm_port_1_vlan_requirements: - type: list + port_pcm_port_01_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements pcm_flavor_name: type: string description: flavor name of PCRF CM instance required: true status: SUPPORTED + port_pcm_port_01_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED pcm_vol: type: string description: CPS Cluman Cinder Volume required: true status: SUPPORTED - port_pcm_port_1_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pcm_port_11_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED cps_net_name: @@ -1259,8 +1255,12 @@ node_types: description: CPS network mask required: true status: SUPPORTED - port_pcm_port_1_order: - type: integer + port_pcm_port_01_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pcm_port_11_subnetpoolid: + type: string required: true status: SUPPORTED attributes: @@ -1269,416 +1269,416 @@ node_types: description: the pcm nova service id status: SUPPORTED requirements: - - dependency_pcm_port_1: + - dependency_pcm_port_11: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_port_1: + - link_pcm_port_11: 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: + network.outgoing.bytes_pcm_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.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: + 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 - disk.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 - network.outpoing.packets_pcm_port_0: + 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.iops_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 - memory.resident_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.device.write.requests_server_pcm: + network.incoming.bytes.rate_pcm_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.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.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. + attachment_pcm_port_01: + type: tosca.capabilities.Attachment 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_pcm_port_11: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_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 - disk.root.size_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 - 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 - disk.device.latency_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 - network.incoming.bytes_pcm_port_0: + 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 - network.incoming.bytes_pcm_port_1: + 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 - 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: + network.outgoing.packets.rate_pcm_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.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. + feature_server_pcm_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.capacity_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 - os_server_pcm: - type: tosca.capabilities.OperatingSystem + 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 - disk.read.bytes_server_pcm: + 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 - network.outgoing.packets.rate_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 - network.outgoing.packets.rate_pcm_port_1: + network.incoming.packets.rate_pcm_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 - feature_pcm_port_1: - type: tosca.capabilities.Node + binding_pcm_port_11: + 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: + 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 - disk.device.read.bytes_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 - feature_pcm_port_0: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes_pcm_port_1: + network.outgoing.bytes.rate_pcm_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 - attachment_pcm_port_0: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - attachment_pcm_port_1: + attachment_pcm_port_11: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - endpoint_server_pcm: + endpoint_server_pcm_1: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_server_pcm: + 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 - vcpus_server_pcm: + 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.write.bytes_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 - disk.iops_server_pcm: + host_server_pcm_1: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent + occurrences: + - 1 + - UNBOUNDED + 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.read.bytes.rate_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.device.allocation_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 - scalable_server_pcm: - type: tosca.capabilities.Scalable + 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 - disk.device.read.bytes.rate_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 - cpu_util_server_pcm: + network.outpoing.packets_pcm_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.write.requests.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 - disk.device.write.bytes.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 - 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: + - 0 + - UNBOUNDED + scalable_server_pcm_1: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - cpu.delta_server_pcm: + 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 - network.outgoing.bytes.rate_pcm_port_1: + 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.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: + network.incoming.packets_pcm_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.capacity_server_pcm: + 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 - network.incoming.packets_pcm_port_1: + 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 - instance_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.device.write.requests.rate_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.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 - feature_server_pcm: - type: tosca.capabilities.Node + network.incoming.bytes_pcm_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.bytes.rate_pcm_port_0: + os_server_pcm_1: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + binding_server_pcm_1: + type: tosca.capabilities.network.Bindable + 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: - 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: - 1 - - UNBOUNDED + - UNBOUNDED
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml index 0c55a9b46c..8335140e6c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml @@ -61,12 +61,12 @@ topology_template: properties: pcm_flavor_name: get_input: pcm_flavor_name + port_pcm_port_11_network_role_tag: oam service_template_filter: substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml - port_pcm_port_1_network_role_tag: oam availabilityzone_name: get_input: availabilityzone_name - port_pcm_port_0_ip_requirements: + port_pcm_port_11_ip_requirements: - ip_version: 4 ip_count_required: is_required: true @@ -74,23 +74,23 @@ topology_template: is_required: false pcm_image_name: get_input: pcm_image_name - port_pcm_port_1_mac_requirements: + port_pcm_port_01_mac_requirements: mac_count_required: is_required: false - port_pcm_port_1_ip_requirements: + port_pcm_port_01_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pcm_port_0_network_role_tag: cps - port_pcm_port_0_mac_requirements: + port_pcm_port_11_mac_requirements: mac_count_required: is_required: false pcm_server_name: get_input: - pcm_server_names - 0 + port_pcm_port_01_network_role_tag: cps server_pcm_001: type: org.openecomp.resource.abstract.nodes.heat.pcm_server directives: @@ -98,12 +98,12 @@ topology_template: properties: pcm_flavor_name: get_input: pcm_flavor_name + port_pcm_port_11_network_role_tag: oam service_template_filter: substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml - port_pcm_port_1_network_role_tag: oam availabilityzone_name: get_input: availabilityzone_name - port_pcm_port_0_ip_requirements: + port_pcm_port_11_ip_requirements: - ip_version: 4 ip_count_required: is_required: true @@ -111,23 +111,23 @@ topology_template: is_required: false pcm_image_name: get_input: pcm_image_name - port_pcm_port_1_mac_requirements: + port_pcm_port_01_mac_requirements: mac_count_required: is_required: false - port_pcm_port_1_ip_requirements: + port_pcm_port_01_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pcm_port_0_network_role_tag: cps - port_pcm_port_0_mac_requirements: + port_pcm_port_11_mac_requirements: mac_count_required: is_required: false pcm_server_name: get_input: - pcm_server_names - 0 + port_pcm_port_01_network_role_tag: cps server_pcm_003: type: org.openecomp.resource.abstract.nodes.heat.pcm_server_2 directives: @@ -189,4 +189,4 @@ topology_template: - server_pcm_002 - server_pcm_001 - server_pcm_003 - - compute_port_0 + - compute_port_0
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml index d999e227be..1e198d3bda 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -11,10 +11,7 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pcm_port_0_network_role: - type: string - required: true - port_pcm_port_1_network_role_tag: + port_pcm_port_11_network_role_tag: type: string required: true availabilityzone_name: @@ -23,27 +20,34 @@ topology_template: immutable: false type: string description: availabilityzone name - port_pcm_port_0_vlan_requirements: + port_pcm_port_11_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements pcm_image_name: label: image name hidden: false immutable: false type: string description: PCRF CM image name - port_pcm_port_0_order: - type: integer + port_pcm_port_01_ip_requirements: + type: list required: true - port_pcm_port_0_subnetpoolid: - type: string + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_01_vlan_requirements: + type: list required: true - port_pcm_port_1_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pcm_port_11_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pcm_port_01_network_role: type: string required: true - port_pcm_port_0_network_role_tag: + port_pcm_port_01_subnetpoolid: type: string required: true pcm_server_name: @@ -58,71 +62,64 @@ topology_template: immutable: false type: string description: CPS network mask - port_pcm_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pcm_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true oam_net_name: label: OAM network name hidden: false immutable: false type: string description: OAM network name - port_pcm_port_1_network_role: + port_pcm_port_01_network_role_tag: type: string required: true - port_pcm_port_0_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements oam_net_gw: label: CPS network gateway hidden: false immutable: false type: string description: CPS network gateway + port_pcm_port_11_network_role: + type: string + required: true security_group_name: label: security group name hidden: false immutable: false type: string description: the name of security group + port_pcm_port_11_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements cps_net_ip: label: CPS network ip hidden: false immutable: false type: string description: CPS network ip - port_pcm_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pcm_port_11_order: + type: integer required: true - port_pcm_port_1_vlan_requirements: - type: list + port_pcm_port_01_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements pcm_flavor_name: label: PCRF CM flavor name hidden: false immutable: false type: string description: flavor name of PCRF CM instance + port_pcm_port_01_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true pcm_vol: label: CPS Cluman Cinder Volume hidden: false immutable: false type: string description: CPS Cluman Cinder Volume - port_pcm_port_1_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pcm_port_11_exCP_naming: + type: org.openecomp.datatypes.Naming required: true cps_net_name: label: CPS network name @@ -142,85 +139,88 @@ topology_template: immutable: false type: string description: CPS network mask - port_pcm_port_1_order: - type: integer + port_pcm_port_01_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pcm_port_11_subnetpoolid: + type: string required: true node_templates: - pcm_port_1: + pcm_port_11: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: - get_input: port_pcm_port_1_ip_requirements + get_input: port_pcm_port_11_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: port_pcm_port_1_network_role + get_input: port_pcm_port_11_network_role fixed_ips: - ip_address: get_input: oam_net_ip subnetpoolid: - get_input: port_pcm_port_1_subnetpoolid + get_input: port_pcm_port_11_subnetpoolid mac_requirements: - get_input: port_pcm_port_1_mac_requirements + get_input: port_pcm_port_11_mac_requirements exCP_naming: - get_input: port_pcm_port_1_exCP_naming + get_input: port_pcm_port_11_exCP_naming vlan_requirements: - get_input: port_pcm_port_1_vlan_requirements + get_input: port_pcm_port_11_vlan_requirements network_role_tag: - get_input: port_pcm_port_1_network_role_tag + get_input: port_pcm_port_11_network_role_tag network: get_input: oam_net_name order: - get_input: port_pcm_port_1_order + get_input: port_pcm_port_11_order 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.compute.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: - get_input: port_pcm_port_0_ip_requirements + get_input: port_pcm_port_01_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: port_pcm_port_0_network_role + get_input: port_pcm_port_01_network_role fixed_ips: - ip_address: get_input: cps_net_ip subnetpoolid: - get_input: port_pcm_port_0_subnetpoolid + get_input: port_pcm_port_01_subnetpoolid mac_requirements: - get_input: port_pcm_port_0_mac_requirements + get_input: port_pcm_port_01_mac_requirements exCP_naming: - get_input: port_pcm_port_0_exCP_naming + get_input: port_pcm_port_01_exCP_naming vlan_requirements: - get_input: port_pcm_port_0_vlan_requirements + get_input: port_pcm_port_01_vlan_requirements network_role_tag: - get_input: port_pcm_port_0_network_role_tag + get_input: port_pcm_port_01_network_role_tag network: get_input: cps_net_name order: - get_input: port_pcm_port_0_order + get_input: port_pcm_port_01_order 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.compute.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 @@ -228,221 +228,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_11 + - 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.pcm_server 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 - - network.incoming.bytes - network.incoming.bytes_pcm_port_1: - - pcm_port_1 + network.outgoing.bytes_pcm_port_11: + - pcm_port_11 + - network.outgoing.bytes + network.incoming.packets_pcm_port_01: + - pcm_port_01 + - network.incoming.packets + feature_pcm_port_01: + - pcm_port_01 + - feature + 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.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 + network.incoming.bytes.rate_pcm_port_11: + - pcm_port_11 + - network.incoming.bytes.rate + disk.read.bytes_server_pcm_1: + - server_pcm_1 - disk.read.bytes - network.outgoing.packets.rate_pcm_port_0: - - pcm_port_0 + attachment_pcm_port_01: + - pcm_port_01 + - attachment + feature_pcm_port_11: + - pcm_port_11 + - feature + network.outgoing.packets.rate_pcm_port_01: + - pcm_port_01 - network.outgoing.packets.rate - network.outgoing.packets.rate_pcm_port_1: - - pcm_port_1 + 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 + network.outgoing.packets.rate_pcm_port_11: + - pcm_port_11 - network.outgoing.packets.rate - feature_pcm_port_1: - - pcm_port_1 + feature_server_pcm_1: + - server_pcm_1 - feature - network.outgoing.bytes_pcm_port_0: - - pcm_port_0 - - network.outgoing.bytes - disk.device.read.bytes_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.packets.rate_pcm_port_11: + - pcm_port_11 + - network.incoming.packets.rate + binding_pcm_port_11: + - pcm_port_11 + - binding + disk.device.read.bytes_server_pcm_1: + - server_pcm_1 - 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 + network.incoming.bytes.rate_pcm_port_01: + - pcm_port_01 + - network.incoming.bytes.rate + network.outgoing.bytes.rate_pcm_port_11: + - pcm_port_11 + - network.outgoing.bytes.rate + attachment_pcm_port_11: + - pcm_port_11 - attachment - endpoint_server_pcm: - - server_pcm + 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.outpoing.packets_pcm_port_11: + - pcm_port_11 + - network.outpoing.packets + 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 + 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 + memory_server_pcm_1: + - server_pcm_1 + - memory + 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 + network.incoming.packets_pcm_port_11: + - pcm_port_11 + - network.incoming.packets + 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 + network.incoming.bytes_pcm_port_11: + - pcm_port_11 + - network.incoming.bytes + os_server_pcm_1: + - server_pcm_1 + - os + 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_11: + - pcm_port_11 - dependency - dependency_server_pcm: - - server_pcm + dependency_pcm_port_01: + - pcm_port_01 - dependency - dependency_pcm_port_1: - - pcm_port_1 + dependency_server_pcm_1: + - server_pcm_1 - dependency + link_pcm_port_01: + - pcm_port_01 + - link + link_pcm_port_11: + - pcm_port_11 + - link + local_storage_server_pcm_1: + - server_pcm_1 + - local_storage
\ No newline at end of file |