diff options
author | ojasdubey <ojas.dubey@amdocs.com> | 2018-11-29 20:46:49 +0530 |
---|---|---|
committer | Avi Gaffa <avi.gaffa@amdocs.com> | 2018-12-02 09:47:45 +0000 |
commit | 6ce1094d509195fe484761467a67a6b3757593b0 (patch) | |
tree | 4c3b0df6711f80c0f20c20ccf013727ff90428d5 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml | |
parent | c2a1b7c2eea934f309838f0082b2b851012be9a1 (diff) |
Fix - Port type and vmtype underscore issue
1. Fix for consolidation of VMs for cases when:
a. VM type contains an underscore
b. Multiple ports per network role
2. Updated the unit test cases and test data
Change-Id: I875f3c8384f8ef2c2aa6add9e30a5f8899ae1a71
Issue-ID: SDC-1966
Signed-off-by: ojasdubey <ojas.dubey@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml')
1 files changed, 189 insertions, 189 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml index 438512f5e8..ce3d6964c1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,12 +8,28 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pcm_port_related_networks: + port_pcm_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pcm_port_1_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pcm_port_1_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pcm_port_1_security_groups: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json index_value: type: integer description: Index value of this substitution service template runtime instance @@ -34,80 +50,64 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pcm_port_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_network_role_tag: - type: string - required: true - status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_pcm_port_mac_requirements: + port_pcm_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pcm_port_order: - type: integer - required: true - status: SUPPORTED - port_pcm_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pcm_port_vlan_requirements: + port_pcm_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pcm_port_ip_requirements: + port_pcm_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_image_name: type: string required: true status: SUPPORTED - port_pcm_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pcm_port_network_role: + port_pcm_port_1_subnetpoolid: type: string required: true status: SUPPORTED - port_pcm_port_subnetpoolid: - type: string + port_pcm_port_1_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_config_drive: type: list required: true status: SUPPORTED entry_schema: type: boolean + port_pcm_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - port_pcm_port_security_groups: - type: list + port_pcm_port_1_order: + type: integer + required: true + status: SUPPORTED + port_pcm_port_1_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: json requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -123,25 +123,20 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pcm_port: + - dependency_pd_server_pcm_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pcm_port: + - link_pd_server_pcm_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - forwarder_pd_server_pcm_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -153,25 +148,30 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pcm_port: + memory.usage_pd_server: type: org.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_pd_server: + memory_pd_server: type: org.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_pd_server: + disk.device.usage_pd_server: type: org.openecomp.capabilities.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_pd_server: + forwarder_pd_server_pcm_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_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: @@ -188,19 +188,12 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pcm_port: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_pd_server_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 - binding_pd_server_pcm_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED cpu_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -231,25 +224,36 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.iops_pd_server: + network.incoming.bytes.rate_pd_server_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 - memory.resident_pd_server: + attachment_pd_server_pcm_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_pd_server_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 - cpu.delta_pd_server: + disk.iops_pd_server: + type: org.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_pd_server: type: org.openecomp.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_pd_server_pcm_port: + cpu.delta_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -267,12 +271,23 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_pcm_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_pd_server: type: org.openecomp.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_pd_server_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 endpoint_pd_server: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -284,6 +299,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_pcm_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED disk.device.allocation_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -307,7 +330,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pcm_port: + network.incoming.bytes_pd_server_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: @@ -330,12 +353,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pcm_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.read.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -354,41 +371,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pcm_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.write.bytes_pd_server: type: org.openecomp.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_pd_server_pcm_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.read.requests_pd_server: type: org.openecomp.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_pd_server_pcm_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - attachment_pd_server_pcm_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED instance_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -402,7 +396,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pcm_port: + network.outgoing.packets.rate_pd_server_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: @@ -450,15 +444,25 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_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 org.openecomp.resource.abstract.nodes.pcm_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pcm_port_related_networks: + port_pcm_port_0_network_role: + 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.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -467,120 +471,116 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - compute_pcm_server_availability_zone: + port_pcm_port_0_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pcm_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pcm_port_fixed_ips: + port_pcm_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_network_role_tag: - type: string + type: org.openecomp.datatypes.network.VlanRequirements + compute_pcm_server_availability_zone: + type: list required: true status: SUPPORTED + entry_schema: + type: string vm_flavor_name: type: string required: true status: SUPPORTED - port_pcm_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pcm_port_order: - type: integer - required: true - status: SUPPORTED compute_pcm_server_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_pcm_port_network: + port_pcm_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pcm_port_vlan_requirements: + type: json + compute_pcm_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pcm_port_ip_requirements: - type: list + type: string + port_pcm_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - compute_pcm_server_user_data_format: - type: list + port_pcm_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_image_name: type: string required: true status: SUPPORTED - port_pcm_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pcm_port_0_related_networks: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_pcm_server_config_drive: type: list required: true status: SUPPORTED entry_schema: type: boolean - port_pcm_port_network_role: - type: string + port_pcm_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pcm_port_subnetpoolid: + port_pcm_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pcm_port_security_groups: - type: list + port_pcm_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json requirements: - - dependency_pcm_server: + - dependency_pcm_server_pcm_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_pcm_server: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_pcm_server_pcm_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_pcm_server_pcm_port: + - 1 + - 1 + - dependency_pcm_server: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_server_pcm_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + - local_storage_pcm_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 - - 1 + - 0 + - UNBOUNDED capabilities: disk.device.read.requests_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -594,16 +594,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pcm_server_pcm_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pcm_server_pcm_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - attachment_pcm_server_pcm_port: - type: tosca.capabilities.Attachment + binding_pcm_server_pcm_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED disk.root.size_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -629,7 +631,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pcm_server_pcm_port: + network.incoming.bytes.rate_pcm_server_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: @@ -647,41 +649,36 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_pcm_server: + network.incoming.packets.rate_pcm_server_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.read.requests_pcm_server: + network.outgoing.packets.rate_pcm_server_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 - memory.resident_pcm_server: + disk.device.write.requests_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pcm_server_pcm_port: + disk.read.requests_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pcm_server_pcm_port: + memory.resident_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_pcm_server_pcm_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.iops_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -694,12 +691,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pcm_server_pcm_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.read.bytes.rate_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -729,26 +720,26 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu_util_pcm_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pcm_server_pcm_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.allocation_pcm_server: + network.incoming.bytes_pcm_server_pcm_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_pcm_server_pcm_port: + cpu_util_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - forwarder_pcm_server_pcm_port: - type: org.openecomp.capabilities.Forwarder + disk.allocation_pcm_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -801,13 +792,16 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pcm_server_pcm_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + attachment_pcm_server_pcm_port_0: + type: tosca.capabilities.Attachment occurrences: - - 0 + - 1 + - UNBOUNDED + network.outgoing.bytes_pcm_server_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.read.bytes_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -832,6 +826,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pcm_server_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_pcm_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -849,41 +849,41 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.bytes_pcm_server: + network.outpoing.packets_pcm_server_pcm_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_pcm_server: + disk.write.bytes_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - endpoint_pcm_server: - type: tosca.capabilities.Endpoint.Admin + disk.ephemeral.size_pcm_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pcm_server_pcm_port: + network.outgoing.bytes.rate_pcm_server_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 - scalable_pcm_server: - type: tosca.capabilities.Scalable + endpoint_pcm_server: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_pcm_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_pcm_server: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pcm_server_pcm_port: + disk.write.requests.rate_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1668,4 +1668,4 @@ node_types: type: tosca.capabilities.OperatingSystem occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED |