diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested')
58 files changed, 13205 insertions, 2073 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 9e0e6efecd..f8f5764af2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -2,32 +2,8 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: GlobalSubstitutionTypes imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml +- openecomp_heat_index: + file: openecomp-heat/_index.yml node_types: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1_2: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute @@ -35,47 +11,83 @@ node_types: pcm_flavor_name: type: string description: flavor name of PCRF CM instance + required: true + status: SUPPORTED availabilityzone_name: type: string description: availabilityzone name + required: true + status: SUPPORTED pcm_image_name: type: string description: PCRF CM image name + required: true + status: SUPPORTED pcm_vol: type: string description: CPS Cluman Cinder Volume + required: true + status: SUPPORTED security_group_name: type: string description: the name of security group + required: true + status: SUPPORTED cps_net_ip: type: string description: CPS network ip + required: true + status: SUPPORTED pcm_server_name: type: string description: PCRF CM server name + required: true + status: SUPPORTED cps_net_name: type: string description: CPS network name + required: true + status: SUPPORTED cps_net_mask: type: string description: CPS network mask + required: true + status: SUPPORTED oam_net_ip: type: string + required: true + status: SUPPORTED oam_net_name: type: string description: OAM network name + required: true + status: SUPPORTED 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 - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_server_pcm: + 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 @@ -83,16 +95,163 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_pcm_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_pcm_port_0: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - endpoint_server_pcm: - type: tosca.capabilities.Endpoint.Admin + 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: + - 1 + - UNBOUNDED + cpu_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_pcm_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_pcm_port_1: + type: org.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: + type: org.openecomp.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: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.resident_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.usage_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.allocation_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.usage_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.root.size_server_pcm: + type: org.openecomp.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: + type: org.openecomp.capabilities.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: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_pcm_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.requests_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.capacity_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -101,6 +260,132 @@ node_types: occurrences: - 1 - UNBOUNDED + disk.read.bytes_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + 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 + 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 + feature_pcm_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_pcm_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_pcm_port_0: + type: tosca.capabilities.Node + occurrences: + - 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. + occurrences: + - 1 + - UNBOUNDED + attachment_pcm_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + attachment_pcm_port_1: + 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: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + vcpus_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes.rate_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.allocation_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + scalable_server_pcm: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes.rate_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_util_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + 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 + 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 host_server_pcm: type: tosca.capabilities.Container valid_source_types: @@ -108,8 +393,21 @@ node_types: occurrences: - 1 - UNBOUNDED - scalable_server_pcm: - type: tosca.capabilities.Scalable + cpu.delta_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_pcm_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pcm_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -118,13 +416,68 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pcm_port_0: - type: tosca.capabilities.Attachment + network.outgoing.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. occurrences: - 1 - UNBOUNDED - attachment_pcm_port_1: - type: tosca.capabilities.Attachment + 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: + - 1 + - UNBOUNDED + network.incoming.packets_pcm_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + 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. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests.rate_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.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 + disk.device.read.requests_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_server_pcm: + type: tosca.capabilities.Node + 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. + occurrences: + - 1 + - UNBOUNDED + 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: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pcm_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -134,54 +487,94 @@ node_types: availabilityzone_name: type: string description: availabilityzone name + required: true + status: SUPPORTED oam_net_gw: type: string description: CPS network gateway + required: true + status: SUPPORTED pcm_image_name: type: string description: PCRF CM image name + required: true + status: SUPPORTED security_group_name: type: string description: the name of security group + required: true + status: SUPPORTED cps_net_ip: type: string description: CPS network ip + required: true + status: SUPPORTED pcm_flavor_name: type: string description: flavor name of PCRF CM instance + required: true + status: SUPPORTED pcm_vol: type: string description: CPS Cluman Cinder Volume + required: true + status: SUPPORTED pcm_server_name: type: string description: PCRF CM server name + required: true + status: SUPPORTED cps_net_name: type: string description: CPS network name + required: true + status: SUPPORTED cps_net_mask: type: string description: CPS network mask + required: true + status: SUPPORTED oam_net_ip: type: string description: OAM network ip + required: true + status: SUPPORTED oam_net_mask: type: string description: CPS network mask + required: true + status: SUPPORTED oam_net_name: type: string description: OAM network name + required: true + status: SUPPORTED 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 - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_server_pcm: + 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 @@ -189,16 +582,163 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_pcm_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_pcm_port_0: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - endpoint_server_pcm: - type: tosca.capabilities.Endpoint.Admin + 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: + - 1 + - UNBOUNDED + cpu_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_pcm_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_pcm_port_1: + type: org.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: + type: org.openecomp.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: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.resident_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.usage_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.allocation_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.usage_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.root.size_server_pcm: + type: org.openecomp.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: + type: org.openecomp.capabilities.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: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_pcm_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.requests_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.capacity_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -207,6 +747,132 @@ node_types: occurrences: - 1 - UNBOUNDED + disk.read.bytes_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + 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 + 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 + feature_pcm_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_pcm_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_pcm_port_0: + type: tosca.capabilities.Node + occurrences: + - 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. + occurrences: + - 1 + - UNBOUNDED + attachment_pcm_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + attachment_pcm_port_1: + 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: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + vcpus_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes.rate_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.allocation_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + scalable_server_pcm: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes.rate_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_util_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + 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 + 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 host_server_pcm: type: tosca.capabilities.Container valid_source_types: @@ -214,8 +880,21 @@ node_types: occurrences: - 1 - UNBOUNDED - scalable_server_pcm: - type: tosca.capabilities.Scalable + cpu.delta_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_pcm_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pcm_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -224,13 +903,68 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pcm_port_0: - type: tosca.capabilities.Attachment + network.outgoing.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. occurrences: - 1 - UNBOUNDED - attachment_pcm_port_1: - type: tosca.capabilities.Attachment + 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: + - 1 + - UNBOUNDED + network.incoming.packets_pcm_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + 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. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests.rate_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.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 + disk.device.read.requests_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_server_pcm: + type: tosca.capabilities.Node + 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. + occurrences: + - 1 + - UNBOUNDED + 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: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pcm_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/MainServiceTemplate.yaml index a0063b174e..d61871c767 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/MainServiceTemplate.yaml @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: Main imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml topology_template: inputs: oam_net_ips: @@ -222,19 +198,19 @@ topology_template: cps_net_mask: get_input: cps_net_mask groups: - hot-nimbus-pcm_v0.4_2: + hot-nimbus-pcm_v0.4_group: type: org.openecomp.groups.heat.HeatStack properties: - heat_file: ../Artifacts/hot-nimbus-pcm_v0.4_2.yaml + heat_file: ../Artifacts/hot-nimbus-pcm_v0.4.yaml description: heat template that creates PCRF Cluman stack members: - - server_pcm_004 - - server_pcm_003 - hot-nimbus-pcm_v0.4: + - server_pcm_002 + - server_pcm_001 + hot-nimbus-pcm_v0.4_2_group: type: org.openecomp.groups.heat.HeatStack properties: - heat_file: ../Artifacts/hot-nimbus-pcm_v0.4.yaml + heat_file: ../Artifacts/hot-nimbus-pcm_v0.4_2.yaml description: heat template that creates PCRF Cluman stack members: - - server_pcm_002 - - server_pcm_001
\ No newline at end of file + - server_pcm_004 + - server_pcm_003
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml index 1b03021742..f0fffa18ed 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: nested-pcm_v0.1 imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml node_types: org.openecomp.resource.vfc.nodes.heat.pcm_server: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server @@ -117,11 +93,21 @@ topology_template: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: - ip_address: get_input: oam_net_ip + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -138,18 +124,28 @@ topology_template: get_input: availabilityzone_name image: get_input: pcm_image_name - config_drive: 'True' + config_drive: true user_data_format: RAW name: get_input: pcm_server_name pcm_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: - ip_address: get_input: cps_net_ip + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: cps network: get_input: cps_net_name requirements: @@ -158,7 +154,7 @@ topology_template: node: server_pcm relationship: tosca.relationships.network.BindsTo groups: - nested-pcm_v0.1: + nested-pcm_v0.1_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/nested-pcm_v0.1.yaml @@ -174,27 +170,195 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1 capabilities: - endpoint_server_pcm: + network.incoming.packets.rate_pcm_port_0: + - pcm_port_0 + - network.incoming.packets.rate + cpu_server_pcm: - server_pcm - - endpoint + - 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 + 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 + 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 - host_server_pcm: + disk.read.bytes_server_pcm: - server_pcm - - host + - 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 + endpoint_server_pcm: + - server_pcm + - 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 + 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 + - 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 - attachment_pcm_port_0: + network.outgoing.bytes.rate_pcm_port_0: - pcm_port_0 - - attachment - attachment_pcm_port_1: + - network.outgoing.bytes.rate + disk.device.capacity_server_pcm: + - server_pcm + - disk.device.capacity + network.incoming.packets_pcm_port_1: - pcm_port_1 - - attachment + - 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.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.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 @@ -204,4 +368,13 @@ topology_template: - link local_storage_server_pcm: - server_pcm - - local_storage
\ No newline at end of file + - local_storage + dependency_pcm_port_0: + - pcm_port_0 + - dependency + dependency_server_pcm: + - server_pcm + - dependency + dependency_pcm_port_1: + - pcm_port_1 + - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml index 34d0c6d899..8aa225dbdc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: nested-pcm_v0.1_2 imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml node_types: org.openecomp.resource.vfc.nodes.heat.pcm_server: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server @@ -103,11 +79,21 @@ topology_template: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: - ip_address: get_input: oam_net_ip + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -124,18 +110,28 @@ topology_template: get_input: availabilityzone_name image: get_input: pcm_image_name - config_drive: 'True' + config_drive: true user_data_format: RAW name: get_input: pcm_server_name pcm_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: - ip_address: get_input: cps_net_ip + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: cps network: get_input: cps_net_name requirements: @@ -144,7 +140,7 @@ topology_template: node: server_pcm relationship: tosca.relationships.network.BindsTo groups: - nested-pcm_v0.1_2: + nested-pcm_v0.1_2_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/nested-pcm_v0.1_2.yaml @@ -160,27 +156,195 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1_2 capabilities: - endpoint_server_pcm: + network.incoming.packets.rate_pcm_port_0: + - pcm_port_0 + - network.incoming.packets.rate + cpu_server_pcm: - server_pcm - - endpoint + - 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 + 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 + 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 - host_server_pcm: + disk.read.bytes_server_pcm: - server_pcm - - host + - 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 + endpoint_server_pcm: + - server_pcm + - 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 + 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 + - 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 - attachment_pcm_port_0: + network.outgoing.bytes.rate_pcm_port_0: - pcm_port_0 - - attachment - attachment_pcm_port_1: + - network.outgoing.bytes.rate + disk.device.capacity_server_pcm: + - server_pcm + - disk.device.capacity + network.incoming.packets_pcm_port_1: - pcm_port_1 - - attachment + - 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.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.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 @@ -190,4 +354,13 @@ topology_template: - link local_storage_server_pcm: - server_pcm - - local_storage
\ No newline at end of file + - local_storage + dependency_pcm_port_0: + - pcm_port_0 + - dependency + dependency_server_pcm: + - server_pcm + - dependency + dependency_pcm_port_1: + - pcm_port_1 + - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/inputs/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/inputs/MANIFEST.json index b32b92ca11..455efc1e25 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/inputs/MANIFEST.json +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/inputs/MANIFEST.json @@ -11,14 +11,17 @@ "file": "hot-nimbus-pcm_v0.4.env", "type": "HEAT_ENV" } - ] - },{ + ] + }, + { "file": "nested-pcm_v0.1.yaml", "type": "HEAT" - },{ + }, + { "file": "hot-nimbus-pcm_v0.4_2.yaml", "type": "HEAT" - },{ + }, + { "file": "nested-pcm_v0.1_2.yaml", "type": "HEAT" }, diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 1b1c4dd621..e2c3da021d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -2,32 +2,8 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: GlobalSubstitutionTypes imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml +- openecomp_heat_index: + file: openecomp-heat/_index.yml node_types: org.openecomp.resource.abstract.nodes.heat.mvs.nested.heat: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute @@ -35,9 +11,13 @@ node_types: vf_module_id: type: string description: Unique ID for this VF_MODULE instance + required: true + status: SUPPORTED vf_name: type: string description: The VF Name; defaults to VMVM for the virtual MVM VNF. + required: true + status: SUPPORTED constraints: - pattern: '[a-zA-Z0-9]+' - max_length: 4 @@ -45,9 +25,13 @@ node_types: cloud_zone_id: type: string description: The cloud zone for this VF instance + required: true + status: SUPPORTED vf_instance_num: type: string description: The number for this VF instance + required: true + status: SUPPORTED constraints: - pattern: '[0-9]+' - max_length: 2 @@ -55,58 +39,90 @@ node_types: virtual_mgmt_ip_0: type: string description: Virtual management network ip address + required: true + status: SUPPORTED indx: type: float description: Index of the current instance + required: true + status: SUPPORTED mvs_mgmt_ip_0: type: list description: List of Management network IP addresses for IPv4 + required: true + status: SUPPORTED entry_schema: type: string flavor: type: string description: Server flavor - constraints: [ - ] + required: true + status: SUPPORTED key_name: type: string description: SSH key name - constraints: [ - ] + required: true + status: SUPPORTED vnf_id: type: string description: Unique ID for this VF instance + required: true + status: SUPPORTED availability_zone_0: type: list description: List of Availability Zone IDs or Names + required: true + status: SUPPORTED entry_schema: type: string mgmt_net_id: type: string description: Neutron UUID for the Management network - constraints: [ - ] + required: true + status: SUPPORTED vm_instance_num: type: list description: VM instance number list must be a list of three-digit numeric value + required: true + status: SUPPORTED entry_schema: type: string bootimage: type: string description: Master bootimage volume id + required: true + status: SUPPORTED sec_groups: type: list description: Security groups + required: true + status: SUPPORTED entry_schema: type: string vf_component: type: string description: The component that this VF instance is running + required: true + status: SUPPORTED constraints: - pattern: '[a-zA-Z0-9]+' - max_length: 3 - min_length: 3 requirements: + - dependency_boot_volume: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - dependency_vnfci: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - local_storage_vnfci: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage @@ -114,29 +130,318 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_data_volume: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - dependency_mgmt_port: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_mgmt_port: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + disk.ephemeral.size_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.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_mgmt_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_vnfci: + type: org.openecomp.capabilities.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_vnfci: + type: org.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_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.capabilities.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_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.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_vnfci: + type: org.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_data_volume: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_mgmt_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.resident_vnfci: + type: org.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_vnfci: type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED + memory.usage_vnfci: + type: org.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_mgmt_port: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED + disk.device.write.bytes.rate_vnfci: + type: org.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_boot_volume: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + feature_data_volume: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.root.size_vnfci: + type: org.openecomp.capabilities.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_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.capabilities.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_vnfci: + type: org.openecomp.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_vnfci: + type: org.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_vnfci: + type: org.openecomp.capabilities.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_vnfci: + type: org.openecomp.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_mgmt_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.capacity_vnfci: + type: org.openecomp.capabilities.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_vnfci: + type: org.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_mgmt_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + network.outgoing.bytes_mgmt_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_mgmt_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 + instance_vnfci: + type: org.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_mgmt_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.capabilities.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_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.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_mgmt_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_vnfci: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + memory_vnfci: + type: org.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_vnfci: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED + binding_vnfci: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + scalable_vnfci: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_vnfci: + type: org.openecomp.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_mgmt_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + vcpus_vnfci: + type: org.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_vnfci: + type: org.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_vnfci: type: tosca.capabilities.Container valid_source_types: @@ -144,23 +449,32 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_vnfci: - type: tosca.capabilities.network.Bindable + disk.device.allocation_vnfci: + type: org.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_boot_volume: - type: tosca.capabilities.Attachment + network.incoming.bytes.rate_mgmt_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - scalable_vnfci: - type: tosca.capabilities.Scalable + disk.read.requests_vnfci: + type: org.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_data_volume: - type: tosca.capabilities.Attachment + feature_boot_volume: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests.rate_vnfci: + type: org.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/heat/nested/multiple_resource_groups/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/MainServiceTemplate.yaml index ffddcce43c..8295fecd44 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/MainServiceTemplate.yaml @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: Main imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml topology_template: inputs: vf_module_id: @@ -229,7 +205,7 @@ topology_template: vf_component: get_input: vf_component groups: - mvs.vfmodule.heat: + mvs.vfmodule.heat_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/mvs.vfmodule.heat.yaml diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml index 315318d4f6..85bd55e44b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: mvs.nested.heat imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml node_types: org.openecomp.resource.vfc.nodes.heat.vnfci: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server @@ -237,6 +213,12 @@ topology_template: mgmt_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: true security_groups: - get_input: sec_groups fixed_ips: @@ -245,6 +227,9 @@ topology_template: - get_input: indx - get_input: - get_input: mvs_mgmt_ip_0 + mac_requirements: + mac_count_required: + is_required: false allowed_address_pairs: - ip_address: get_input: virtual_mgmt_ip_0 @@ -265,6 +250,7 @@ topology_template: get_input: vf_component $VF_INSTANCE_NUM: get_input: vf_instance_num + network_role_tag: mgmt network: get_input: mgmt_net_id requirements: @@ -273,7 +259,7 @@ topology_template: node: vnfci relationship: tosca.relationships.network.BindsTo groups: - mvs.nested.heat: + mvs.nested.heat_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/mvs.nested.heat.yaml @@ -287,34 +273,190 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.mvs.nested.heat capabilities: + disk.ephemeral.size_vnfci: + - vnfci + - disk.ephemeral.size + disk.iops_vnfci: + - vnfci + - disk.iops + network.outgoing.bytes.rate_mgmt_port: + - mgmt_port + - network.outgoing.bytes.rate + disk.device.write.bytes_vnfci: + - vnfci + - disk.device.write.bytes + disk.device.iops_vnfci: + - vnfci + - disk.device.iops + cpu_util_vnfci: + - vnfci + - cpu_util + disk.write.bytes.rate_vnfci: + - vnfci + - disk.write.bytes.rate + disk.device.latency_vnfci: + - vnfci + - disk.device.latency + disk.latency_vnfci: + - vnfci + - disk.latency + disk.write.requests_vnfci: + - vnfci + - disk.write.requests + attachment_data_volume: + - data_volume + - attachment + network.outpoing.packets_mgmt_port: + - mgmt_port + - network.outpoing.packets + memory.resident_vnfci: + - vnfci + - memory.resident os_vnfci: - vnfci - os + memory.usage_vnfci: + - vnfci + - memory.usage attachment_mgmt_port: - mgmt_port - attachment + disk.device.write.bytes.rate_vnfci: + - vnfci + - disk.device.write.bytes.rate + attachment_boot_volume: + - boot_volume + - attachment + feature_data_volume: + - data_volume + - feature + disk.root.size_vnfci: + - vnfci + - disk.root.size + disk.device.usage_vnfci: + - vnfci + - disk.device.usage + disk.read.bytes_vnfci: + - vnfci + - disk.read.bytes + disk.device.read.bytes.rate_vnfci: + - vnfci + - disk.device.read.bytes.rate + disk.read.bytes.rate_vnfci: + - vnfci + - disk.read.bytes.rate + cpu_vnfci: + - vnfci + - cpu + disk.device.write.requests.rate_vnfci: + - vnfci + - disk.device.write.requests.rate + network.incoming.bytes_mgmt_port: + - mgmt_port + - network.incoming.bytes + disk.capacity_vnfci: + - vnfci + - disk.capacity + disk.device.read.requests_vnfci: + - vnfci + - disk.device.read.requests + binding_mgmt_port: + - mgmt_port + - binding + network.outgoing.bytes_mgmt_port: + - mgmt_port + - network.outgoing.bytes + network.incoming.packets_mgmt_port: + - mgmt_port + - network.incoming.packets + instance_vnfci: + - vnfci + - instance + feature_mgmt_port: + - mgmt_port + - feature + disk.device.read.bytes_vnfci: + - vnfci + - disk.device.read.bytes + disk.allocation_vnfci: + - vnfci + - disk.allocation + disk.write.requests.rate_vnfci: + - vnfci + - disk.write.requests.rate + disk.write.bytes_vnfci: + - vnfci + - disk.write.bytes + disk.device.write.requests_vnfci: + - vnfci + - disk.device.write.requests + disk.usage_vnfci: + - vnfci + - disk.usage + network.incoming.packets.rate_mgmt_port: + - mgmt_port + - network.incoming.packets.rate + feature_vnfci: + - vnfci + - feature + memory_vnfci: + - vnfci + - memory endpoint_vnfci: - vnfci - endpoint - host_vnfci: - - vnfci - - host binding_vnfci: - vnfci - binding - attachment_boot_volume: - - boot_volume - - attachment scalable_vnfci: - vnfci - scalable - attachment_data_volume: - - data_volume - - attachment + disk.device.capacity_vnfci: + - vnfci + - disk.device.capacity + network.outgoing.packets.rate_mgmt_port: + - mgmt_port + - network.outgoing.packets.rate + vcpus_vnfci: + - vnfci + - vcpus + cpu.delta_vnfci: + - vnfci + - cpu.delta + host_vnfci: + - vnfci + - host + disk.device.allocation_vnfci: + - vnfci + - disk.device.allocation + network.incoming.bytes.rate_mgmt_port: + - mgmt_port + - network.incoming.bytes.rate + disk.read.requests_vnfci: + - vnfci + - disk.read.requests + feature_boot_volume: + - boot_volume + - feature + disk.device.read.requests.rate_vnfci: + - vnfci + - disk.device.read.requests.rate requirements: + dependency_mgmt_port: + - mgmt_port + - dependency + dependency_vnfci: + - vnfci + - dependency local_storage_vnfci: - vnfci - local_storage + dependency_data_volume: + - data_volume + - dependency link_mgmt_port: - mgmt_port - - link
\ No newline at end of file + - link + dependency_boot_volume: + - boot_volume + - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index e5cffd7233..f2dee5053a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -2,32 +2,8 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: GlobalSubstitutionTypes imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml +- openecomp_heat_index: + file: openecomp-heat/_index.yml node_types: org.openecomp.resource.abstract.nodes.heat.nested: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute @@ -35,51 +11,103 @@ node_types: cmaui_names: type: list description: CMAUI1, CMAUI2 server names + required: true + status: SUPPORTED entry_schema: type: string p2: type: string description: UID of OAM network + required: true + status: SUPPORTED cmaui_image: type: string description: Image for CMAUI server + required: true + status: SUPPORTED cmaui_flavor: type: string description: Flavor for CMAUI server + required: true + status: SUPPORTED availability_zone_0: type: string description: availabilityzone name + required: true + status: SUPPORTED cmaui_oam_ips: type: string description: cmaui_port_1 + required: true + status: SUPPORTED net: type: string description: UID of OAM network + required: true + status: SUPPORTED shared_security_group_id1: type: string description: UID of OAM network + required: true + status: SUPPORTED + attributes: + output_attr_1: + type: string + status: SUPPORTED requirements: + - dependency_cmaui_port_2: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_cmaui_port_2: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_test_nested2: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - dependency_cmaui_port_11_test_nested2: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_cmaui_port_11_test_nested2: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_cmaui_port_22_test_nested2: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_cmaui_port_22_test_nested2: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_server_cmaui_test_nested2: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - local_storage_server_cmaui_test_nested2: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage @@ -87,6 +115,13 @@ node_types: 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 @@ -94,16 +129,53 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_cmaui_port_1: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_cmaui_port_1: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - os_server_cmaui: - type: tosca.capabilities.OperatingSystem + 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: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_cmaui_port_22_test_nested2: + type: org.openecomp.capabilities.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.write.requests.rate_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.capacity_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -112,6 +184,24 @@ node_types: occurrences: - 1 - UNBOUNDED + disk.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. + occurrences: + - 1 + - UNBOUNDED + disk.latency_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes.rate_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED host_server_cmaui: type: tosca.capabilities.Container valid_source_types: @@ -119,28 +209,241 @@ node_types: occurrences: - 1 - UNBOUNDED - endpoint_server_cmaui: + cpu_util_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_cmaui_port_11_test_nested2: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + endpoint_server_cmaui_test_nested2: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_11_test_nested2: - type: tosca.capabilities.Attachment + disk.device.read.bytes_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_server_cmaui: + disk.device.write.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. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_cmaui_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_cmaui_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.usage_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_cmaui_port_11_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + instance_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.root.size_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 + binding_cmaui_port_22_test_nested2: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + binding_server_cmaui_test_nested2: type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_2: - type: tosca.capabilities.Attachment + network.incoming.packets_cmaui_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - endpoint_server_cmaui_test_nested2: - type: tosca.capabilities.Endpoint.Admin + 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. + occurrences: + - 1 + - UNBOUNDED + disk.allocation_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_cmaui_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.requests_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_cmaui_port_22_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.requests_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_cmaui_port_11_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + os_server_cmaui_test_nested2: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + feature_cmaui_port_22_test_nested2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + cpu_util_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_server_cmaui: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + binding_cmaui_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + binding_cmaui_port_2: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.write.bytes_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + vcpus_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.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. + occurrences: + - 1 + - UNBOUNDED + disk.ephemeral.size_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_cmaui_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.resident_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_cmaui_port_22_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_cmaui_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_cmaui_port_11_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.iops_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -151,8 +454,114 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_server_cmaui_test_nested2: - type: tosca.capabilities.network.Bindable + disk.usage_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.iops_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_cmaui_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes_server_cmaui: + type: org.openecomp.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: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.ephemeral.size_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_cmaui_port_11_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_cmaui_port_11_test_nested2: + type: org.openecomp.capabilities.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_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_cmaui_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + 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: + - 1 + - UNBOUNDED + cpu_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_cmaui_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_cmaui_port_2: + type: tosca.capabilities.Node + 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. + 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. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_cmaui_port_11_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + attachment_cmaui_port_2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -161,8 +570,20 @@ node_types: occurrences: - 1 - UNBOUNDED - os_server_cmaui_test_nested2: - type: tosca.capabilities.OperatingSystem + feature_test_nested2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.latency_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. occurrences: - 1 - UNBOUNDED @@ -171,55 +592,385 @@ node_types: 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. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_cmaui_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. + occurrences: + - 1 + - UNBOUNDED + disk.device.allocation_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.usage_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. + occurrences: + - 1 + - UNBOUNDED attachment_cmaui_port_1: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED + memory_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.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. + occurrences: + - 1 + - UNBOUNDED + disk.write.requests.rate_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes.rate_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. + occurrences: + - 1 + - UNBOUNDED + disk.device.latency_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_cmaui_port_11_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes.rate_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + instance_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes.rate_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.usage_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_server_cmaui: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + disk.iops_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.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 + feature_server_cmaui_test_nested2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.iops_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests.rate_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_cmaui_port_11_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_cmaui_port_22_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + 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. + 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 + vcpus_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_cmaui_port_22_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_cmaui_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_cmaui_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.root.size_server_cmaui_test_nested2: + type: org.openecomp.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. + occurrences: + - 1 + - UNBOUNDED + disk.write.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. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_cmaui_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_cmaui_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_cmaui_port_22_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_cmaui_port_22_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu.delta_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_cmaui_port_22_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + endpoint_server_cmaui: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + feature_cmaui_port_11_test_nested2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + attachment_cmaui_port_11_test_nested2: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED org.openecomp.resource.abstract.nodes.heat.nested2level: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute properties: cmaui_names: type: list description: CMAUI1, CMAUI2 server names + required: true + status: SUPPORTED entry_schema: type: string p2: type: string description: UID of OAM network + required: true + status: SUPPORTED cmaui_image: type: string description: Image for CMAUI server + required: true + status: SUPPORTED cmaui_flavor: type: string description: Flavor for CMAUI server + required: true + status: SUPPORTED availability_zone_0: type: string description: availabilityzone name + required: true + status: SUPPORTED cmaui_oam_ips: type: string description: cmaui_port_1 + required: true + status: SUPPORTED net: type: string description: UID of OAM network + required: true + status: SUPPORTED shared_security_group_id1: type: string description: UID of OAM network + required: true + status: SUPPORTED requirements: + - dependency_cmaui_port_11: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_cmaui_port_11: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_cmaui_port_22: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_cmaui_port_22: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo 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 @@ -228,6 +979,72 @@ node_types: - 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: + type: org.openecomp.capabilities.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 + network.outpoing.packets_cmaui_port_11: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_cmaui_port_22: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_cmaui_port_22: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + scalable_server_cmaui: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + disk.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. + 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: + type: org.openecomp.capabilities.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. + occurrences: + - 1 + - UNBOUNDED host_server_cmaui: type: tosca.capabilities.Container valid_source_types: @@ -235,13 +1052,155 @@ node_types: occurrences: - 1 - UNBOUNDED + cpu_util_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_cmaui_port_22: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.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 + disk.device.write.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. + 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. + 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. + occurrences: + - 1 + - UNBOUNDED + disk.usage_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_cmaui_port_22: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. + occurrences: + - 1 + - UNBOUNDED + disk.write.requests.rate_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_cmaui_port_22: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. + occurrences: + - 1 + - UNBOUNDED + instance_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. + occurrences: + - 1 + - UNBOUNDED + feature_cmaui_port_22: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.root.size_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_cmaui_port_22: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_server_cmaui: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + disk.device.read.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.write.bytes_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED os_server_cmaui: type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_11: - type: tosca.capabilities.Attachment + 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. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_cmaui_port_11: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_cmaui_port_11: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -250,18 +1209,145 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_cmaui_port_11: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_cmaui_port_11: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_cmaui_port_22: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 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. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_cmaui_port_22: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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 + vcpus_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.bytes_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. + occurrences: + - 1 + - UNBOUNDED + disk.write.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. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_cmaui_port_11: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_cmaui_port_11: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + memory.usage_server_cmaui: + type: org.openecomp.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: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + attachment_cmaui_port_11: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_cmaui_port_11: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED endpoint_server_cmaui: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - binding_server_cmaui: - type: tosca.capabilities.network.Bindable + network.outgoing.bytes_cmaui_port_22: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - scalable_server_cmaui: - type: tosca.capabilities.Scalable + disk.iops_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_cmaui_port_11: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.iops_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_cmaui_port_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.bytes_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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/heat/nested/nested2levels/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/MainServiceTemplate.yaml index b619c99256..ffbd020e31 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/MainServiceTemplate.yaml @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: Main imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml topology_template: inputs: security_group_name: @@ -54,6 +30,20 @@ topology_template: type: string description: network name of jsa log network node_templates: + packet_mirror_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + shared: + get_attribute: + - test_nested + - output_attr_1 + network_name: + get_input: jsa_net_name + requirements: + - dependency: + capability: tosca.capabilities.Node + node: test_nested + relationship: tosca.relationships.DependsOn jsa_security_group1: type: org.openecomp.resource.vfc.rules.nodes.heat.network.neutron.SecurityRules properties: @@ -131,9 +121,17 @@ topology_template: node: test_nested relationship: org.openecomp.relationships.AttachesTo - port: + capability: attachment_cmaui_port_22_test_nested2 + node: test_nested + relationship: org.openecomp.relationships.AttachesTo + - port: capability: attachment_cmaui_port_1 node: test_nested relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_cmaui_port_11_test_nested2 + node: test_nested + relationship: org.openecomp.relationships.AttachesTo jsa_security_group2: type: org.openecomp.resource.vfc.rules.nodes.heat.network.neutron.SecurityRules properties: @@ -210,6 +208,10 @@ topology_template: capability: attachment_cmaui_port_1 node: test_nested relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_cmaui_port_11_test_nested2 + node: test_nested + relationship: org.openecomp.relationships.AttachesTo test_nested: type: org.openecomp.resource.abstract.nodes.heat.nested directives: @@ -222,20 +224,21 @@ topology_template: shared_security_group_id1: get_input: shared_security_group_id1 groups: - addOn: + base_group: type: org.openecomp.groups.heat.HeatStack properties: - heat_file: ../Artifacts/addOn.yml + heat_file: ../Artifacts/base.yml description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - test_nested - base: + - jsa_security_group1 + - jsa_security_group2 + addOn_group: type: org.openecomp.groups.heat.HeatStack properties: - heat_file: ../Artifacts/base.yml + heat_file: ../Artifacts/addOn.yml description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - jsa_security_group1 - - jsa_security_group2
\ No newline at end of file + - packet_mirror_network + - test_nested
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nested2levelServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nested2levelServiceTemplate.yaml index e26b5c6c18..2f611eb33d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nested2levelServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nested2levelServiceTemplate.yaml @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: nested2level imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml node_types: org.openecomp.resource.vfc.nodes.heat.cmaui: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server @@ -83,6 +59,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: shared_security_group_id1 - get_input: p2 @@ -91,6 +73,9 @@ topology_template: get_input: - cmaui_oam_ips - 0 + mac_requirements: + mac_count_required: + is_required: false network: get_input: net requirements: @@ -102,6 +87,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: shared_security_group_id1 fixed_ips: @@ -109,6 +100,9 @@ topology_template: get_input: - cmaui_oam_ips - 0 + mac_requirements: + mac_count_required: + is_required: false network: get_input: net requirements: @@ -130,7 +124,7 @@ topology_template: - cmaui_names - 0 groups: - nested2level: + nested2level_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/nested2level.yml @@ -142,28 +136,199 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested2level capabilities: + cpu.delta_server_cmaui: + - server_cmaui + - cpu.delta + disk.device.write.requests.rate_server_cmaui: + - server_cmaui + - disk.device.write.requests.rate + disk.device.allocation_server_cmaui: + - server_cmaui + - disk.device.allocation + network.outpoing.packets_cmaui_port_11: + - cmaui_port_11 + - network.outpoing.packets + network.outgoing.packets.rate_cmaui_port_22: + - cmaui_port_22 + - network.outgoing.packets.rate + binding_cmaui_port_22: + - cmaui_port_22 + - binding + 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 + network.incoming.packets.rate_cmaui_port_22: + - cmaui_port_22 + - network.incoming.packets.rate + disk.device.latency_server_cmaui: + - server_cmaui + - disk.device.latency + disk.device.write.requests_server_cmaui: + - server_cmaui + - disk.device.write.requests + disk.read.requests_server_cmaui: + - server_cmaui + - disk.read.requests + disk.device.capacity_server_cmaui: + - server_cmaui + - disk.device.capacity + disk.usage_server_cmaui: + - server_cmaui + - disk.usage + disk.device.usage_server_cmaui: + - server_cmaui + - disk.device.usage + network.outgoing.bytes.rate_cmaui_port_22: + - cmaui_port_22 + - network.outgoing.bytes.rate + disk.capacity_server_cmaui: + - server_cmaui + - disk.capacity + disk.write.requests.rate_server_cmaui: + - server_cmaui + - disk.write.requests.rate + network.outpoing.packets_cmaui_port_22: + - cmaui_port_22 + - network.outpoing.packets + disk.device.read.requests_server_cmaui: + - server_cmaui + - disk.device.read.requests + instance_server_cmaui: + - server_cmaui + - instance + disk.device.read.bytes_server_cmaui: + - server_cmaui + - disk.device.read.bytes + memory_server_cmaui: + - server_cmaui + - memory + feature_cmaui_port_22: + - cmaui_port_22 + - feature + disk.root.size_server_cmaui: + - server_cmaui + - disk.root.size + network.incoming.bytes.rate_cmaui_port_22: + - cmaui_port_22 + - network.incoming.bytes.rate + 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 - attachment_cmaui_port_11: + disk.device.write.bytes.rate_server_cmaui: + - server_cmaui + - disk.device.write.bytes.rate + network.outgoing.bytes.rate_cmaui_port_11: - cmaui_port_11 - - attachment + - network.outgoing.bytes.rate + feature_cmaui_port_11: + - cmaui_port_11 + - feature attachment_cmaui_port_22: - cmaui_port_22 - attachment + network.incoming.bytes.rate_cmaui_port_11: + - cmaui_port_11 + - network.incoming.bytes.rate + network.outgoing.bytes_cmaui_port_11: + - cmaui_port_11 + - network.outgoing.bytes + network.incoming.packets_cmaui_port_22: + - cmaui_port_22 + - network.incoming.packets + memory.resident_server_cmaui: + - server_cmaui + - memory.resident + network.incoming.bytes_cmaui_port_22: + - cmaui_port_22 + - network.incoming.bytes + disk.latency_server_cmaui: + - server_cmaui + - disk.latency + feature_server_cmaui: + - server_cmaui + - feature + vcpus_server_cmaui: + - server_cmaui + - vcpus + disk.device.write.bytes_server_cmaui: + - server_cmaui + - disk.device.write.bytes + disk.allocation_server_cmaui: + - server_cmaui + - disk.allocation + disk.write.requests_server_cmaui: + - server_cmaui + - disk.write.requests + network.outgoing.packets.rate_cmaui_port_11: + - cmaui_port_11 + - network.outgoing.packets.rate + binding_cmaui_port_11: + - cmaui_port_11 + - binding + memory.usage_server_cmaui: + - server_cmaui + - memory.usage + disk.ephemeral.size_server_cmaui: + - server_cmaui + - disk.ephemeral.size + attachment_cmaui_port_11: + - cmaui_port_11 + - attachment + network.incoming.packets.rate_cmaui_port_11: + - cmaui_port_11 + - network.incoming.packets.rate endpoint_server_cmaui: - server_cmaui - endpoint - binding_server_cmaui: + network.outgoing.bytes_cmaui_port_22: + - cmaui_port_22 + - network.outgoing.bytes + disk.iops_server_cmaui: - server_cmaui - - binding - scalable_server_cmaui: + - disk.iops + network.incoming.packets_cmaui_port_11: + - cmaui_port_11 + - network.incoming.packets + disk.device.iops_server_cmaui: - server_cmaui - - scalable + - disk.device.iops + network.incoming.bytes_cmaui_port_11: + - cmaui_port_11 + - network.incoming.bytes + disk.read.bytes_server_cmaui: + - server_cmaui + - disk.read.bytes requirements: + dependency_server_cmaui: + - server_cmaui + - dependency local_storage_server_cmaui: - server_cmaui - local_storage @@ -172,4 +337,10 @@ topology_template: - link link_cmaui_port_22: - cmaui_port_22 - - link
\ No newline at end of file + - link + dependency_cmaui_port_11: + - cmaui_port_11 + - dependency + dependency_cmaui_port_22: + - cmaui_port_22 + - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nestedServiceTemplate.yaml index 8001ba9d7d..bd00c83084 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nestedServiceTemplate.yaml @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: nested imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml node_types: org.openecomp.resource.vfc.nodes.heat.cmaui: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server @@ -83,6 +59,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: shared_security_group_id1 fixed_ips: @@ -90,6 +72,9 @@ topology_template: get_input: - cmaui_oam_ips - 0 + mac_requirements: + mac_count_required: + is_required: false network: get_input: net requirements: @@ -117,6 +102,10 @@ topology_template: get_input: availability_zone_0 image: get_input: cmaui_image + metadata: + get_attribute: + - test_nested2 + - availability_zone_0 name: get_input: - cmaui_names @@ -125,6 +114,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: shared_security_group_id1 - get_input: p2 @@ -133,6 +128,9 @@ topology_template: get_input: - cmaui_oam_ips - 0 + mac_requirements: + mac_count_required: + is_required: false network: get_input: net requirements: @@ -141,7 +139,7 @@ topology_template: node: server_cmaui relationship: tosca.relationships.network.BindsTo groups: - nested: + nested_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/nested.yml @@ -151,67 +149,433 @@ topology_template: - test_nested2 - server_cmaui - cmaui_port_1 + outputs: + output_attr_1: + value: + get_attribute: + - test_nested2 + - availability_zone_0 substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested capabilities: - os_server_cmaui: + cpu.delta_server_cmaui: - server_cmaui - - os + - cpu.delta + disk.device.write.requests.rate_server_cmaui: + - server_cmaui + - disk.device.write.requests.rate + network.incoming.packets.rate_cmaui_port_22_test_nested2: + - test_nested2 + - network.incoming.packets.rate_cmaui_port_22 + disk.device.allocation_server_cmaui: + - server_cmaui + - disk.device.allocation + disk.write.requests.rate_server_cmaui_test_nested2: + - test_nested2 + - disk.write.requests.rate_server_cmaui + disk.capacity_server_cmaui_test_nested2: + - test_nested2 + - disk.capacity_server_cmaui scalable_server_cmaui: - server_cmaui - scalable + disk.read.bytes.rate_server_cmaui: + - server_cmaui + - disk.read.bytes.rate + disk.latency_server_cmaui_test_nested2: + - test_nested2 + - disk.latency_server_cmaui + disk.read.bytes.rate_server_cmaui_test_nested2: + - test_nested2 + - disk.read.bytes.rate_server_cmaui host_server_cmaui: - server_cmaui - host - endpoint_server_cmaui: + cpu_util_server_cmaui: - server_cmaui - - endpoint - attachment_cmaui_port_11_test_nested2: + - cpu_util + binding_cmaui_port_11_test_nested2: - test_nested2 - - attachment_cmaui_port_11 - binding_server_cmaui: + - binding_cmaui_port_11 + endpoint_server_cmaui_test_nested2: + - test_nested2 + - endpoint_server_cmaui + disk.device.read.bytes_server_cmaui_test_nested2: + - test_nested2 + - disk.device.read.bytes_server_cmaui + disk.device.write.requests_server_cmaui: + - server_cmaui + - disk.device.write.requests + network.outgoing.bytes_cmaui_port_2: + - cmaui_port_2 + - network.outgoing.bytes + network.outgoing.bytes_cmaui_port_1: + - cmaui_port_1 + - network.outgoing.bytes + memory.usage_server_cmaui_test_nested2: + - test_nested2 + - memory.usage_server_cmaui + network.incoming.packets.rate_cmaui_port_11_test_nested2: + - test_nested2 + - network.incoming.packets.rate_cmaui_port_11 + instance_server_cmaui: - server_cmaui + - instance + disk.device.read.bytes_server_cmaui: + - server_cmaui + - disk.device.read.bytes + disk.root.size_server_cmaui: + - server_cmaui + - disk.root.size + binding_cmaui_port_22_test_nested2: + - test_nested2 + - binding_cmaui_port_22 + binding_server_cmaui_test_nested2: + - test_nested2 + - binding_server_cmaui + network.incoming.packets_cmaui_port_2: + - cmaui_port_2 + - network.incoming.packets + os_server_cmaui: + - server_cmaui + - os + disk.device.write.bytes.rate_server_cmaui: + - server_cmaui + - disk.device.write.bytes.rate + disk.allocation_server_cmaui_test_nested2: + - test_nested2 + - disk.allocation_server_cmaui + network.incoming.packets_cmaui_port_1: + - cmaui_port_1 + - network.incoming.packets + disk.read.requests_server_cmaui_test_nested2: + - test_nested2 + - disk.read.requests_server_cmaui + network.incoming.bytes.rate_cmaui_port_22_test_nested2: + - test_nested2 + - network.incoming.bytes.rate_cmaui_port_22 + disk.write.requests_server_cmaui_test_nested2: + - test_nested2 + - disk.write.requests_server_cmaui + network.outpoing.packets_cmaui_port_11_test_nested2: + - test_nested2 + - network.outpoing.packets_cmaui_port_11 + os_server_cmaui_test_nested2: + - test_nested2 + - os_server_cmaui + feature_cmaui_port_22_test_nested2: + - test_nested2 + - feature_cmaui_port_22 + cpu_util_server_cmaui_test_nested2: + - test_nested2 + - cpu_util_server_cmaui + feature_server_cmaui: + - server_cmaui + - feature + binding_cmaui_port_1: + - cmaui_port_1 - binding - attachment_cmaui_port_2: + binding_cmaui_port_2: - cmaui_port_2 - - attachment - endpoint_server_cmaui_test_nested2: + - binding + disk.write.bytes_server_cmaui_test_nested2: - test_nested2 - - endpoint_server_cmaui + - disk.write.bytes_server_cmaui + vcpus_server_cmaui_test_nested2: + - test_nested2 + - vcpus_server_cmaui + memory.usage_server_cmaui: + - server_cmaui + - memory.usage + disk.ephemeral.size_server_cmaui: + - server_cmaui + - disk.ephemeral.size + network.outgoing.bytes.rate_cmaui_port_2: + - cmaui_port_2 + - network.outgoing.bytes.rate + cpu_server_cmaui_test_nested2: + - test_nested2 + - cpu_server_cmaui + memory.resident_server_cmaui_test_nested2: + - test_nested2 + - memory.resident_server_cmaui + network.outgoing.packets.rate_cmaui_port_22_test_nested2: + - test_nested2 + - network.outgoing.packets.rate_cmaui_port_22 + network.outgoing.bytes.rate_cmaui_port_1: + - cmaui_port_1 + - network.outgoing.bytes.rate + network.outgoing.bytes.rate_cmaui_port_11_test_nested2: + - test_nested2 + - network.outgoing.bytes.rate_cmaui_port_11 + disk.iops_server_cmaui: + - server_cmaui + - disk.iops host_server_cmaui_test_nested2: - test_nested2 - host_server_cmaui - binding_server_cmaui_test_nested2: + disk.usage_server_cmaui_test_nested2: - test_nested2 - - binding_server_cmaui + - disk.usage_server_cmaui + disk.device.iops_server_cmaui: + - server_cmaui + - disk.device.iops + network.incoming.bytes_cmaui_port_2: + - cmaui_port_2 + - network.incoming.bytes + disk.read.bytes_server_cmaui: + - server_cmaui + - disk.read.bytes + network.incoming.bytes_cmaui_port_1: + - cmaui_port_1 + - network.incoming.bytes + disk.ephemeral.size_server_cmaui_test_nested2: + - test_nested2 + - disk.ephemeral.size_server_cmaui + network.incoming.packets_cmaui_port_11_test_nested2: + - test_nested2 + - network.incoming.packets_cmaui_port_11 + network.incoming.bytes_cmaui_port_11_test_nested2: + - test_nested2 + - network.incoming.bytes_cmaui_port_11 + disk.device.read.requests.rate_server_cmaui_test_nested2: + - test_nested2 + - disk.device.read.requests.rate_server_cmaui + network.incoming.packets.rate_cmaui_port_1: + - cmaui_port_1 + - network.incoming.packets.rate + network.incoming.packets.rate_cmaui_port_2: + - cmaui_port_2 + - network.incoming.packets.rate + cpu_server_cmaui: + - server_cmaui + - cpu + feature_cmaui_port_1: + - cmaui_port_1 + - feature + feature_cmaui_port_2: + - cmaui_port_2 + - feature + disk.write.bytes.rate_server_cmaui: + - server_cmaui + - disk.write.bytes.rate + disk.device.read.bytes.rate_server_cmaui: + - server_cmaui + - disk.device.read.bytes.rate + disk.device.write.bytes_server_cmaui_test_nested2: + - test_nested2 + - disk.device.write.bytes_server_cmaui + network.incoming.bytes.rate_cmaui_port_11_test_nested2: + - test_nested2 + - network.incoming.bytes.rate_cmaui_port_11 + attachment_cmaui_port_2: + - cmaui_port_2 + - attachment scalable_server_cmaui_test_nested2: - test_nested2 - scalable_server_cmaui - os_server_cmaui_test_nested2: + feature_test_nested2: - test_nested2 - - os_server_cmaui + - feature + disk.device.latency_server_cmaui: + - server_cmaui + - disk.device.latency + disk.read.requests_server_cmaui: + - server_cmaui + - disk.read.requests attachment_cmaui_port_22_test_nested2: - test_nested2 - attachment_cmaui_port_22 + disk.device.capacity_server_cmaui: + - server_cmaui + - disk.device.capacity + network.outgoing.packets.rate_cmaui_port_1: + - cmaui_port_1 + - network.outgoing.packets.rate + network.outgoing.packets.rate_cmaui_port_2: + - cmaui_port_2 + - network.outgoing.packets.rate + disk.device.allocation_server_cmaui_test_nested2: + - test_nested2 + - disk.device.allocation_server_cmaui + disk.read.bytes_server_cmaui_test_nested2: + - test_nested2 + - disk.read.bytes_server_cmaui + disk.usage_server_cmaui: + - server_cmaui + - disk.usage + disk.device.usage_server_cmaui: + - server_cmaui + - disk.device.usage attachment_cmaui_port_1: - cmaui_port_1 - attachment + memory_server_cmaui_test_nested2: + - test_nested2 + - memory_server_cmaui + disk.capacity_server_cmaui: + - server_cmaui + - disk.capacity + disk.write.requests.rate_server_cmaui: + - server_cmaui + - disk.write.requests.rate + disk.device.read.requests_server_cmaui_test_nested2: + - test_nested2 + - disk.device.read.requests_server_cmaui + disk.device.read.bytes.rate_server_cmaui_test_nested2: + - test_nested2 + - disk.device.read.bytes.rate_server_cmaui + disk.device.read.requests_server_cmaui: + - server_cmaui + - disk.device.read.requests + disk.device.latency_server_cmaui_test_nested2: + - test_nested2 + - disk.device.latency_server_cmaui + network.outgoing.bytes_cmaui_port_11_test_nested2: + - test_nested2 + - network.outgoing.bytes_cmaui_port_11 + disk.device.write.bytes.rate_server_cmaui_test_nested2: + - test_nested2 + - disk.device.write.bytes.rate_server_cmaui + instance_server_cmaui_test_nested2: + - test_nested2 + - instance_server_cmaui + memory_server_cmaui: + - server_cmaui + - memory + disk.write.bytes.rate_server_cmaui_test_nested2: + - test_nested2 + - disk.write.bytes.rate_server_cmaui + disk.device.usage_server_cmaui_test_nested2: + - test_nested2 + - disk.device.usage_server_cmaui + binding_server_cmaui: + - server_cmaui + - binding + disk.iops_server_cmaui_test_nested2: + - test_nested2 + - disk.iops_server_cmaui + disk.device.read.requests.rate_server_cmaui: + - server_cmaui + - disk.device.read.requests.rate + feature_server_cmaui_test_nested2: + - test_nested2 + - feature_server_cmaui + disk.write.bytes_server_cmaui: + - server_cmaui + - disk.write.bytes + disk.device.iops_server_cmaui_test_nested2: + - test_nested2 + - disk.device.iops_server_cmaui + disk.device.write.requests.rate_server_cmaui_test_nested2: + - test_nested2 + - disk.device.write.requests.rate_server_cmaui + network.outgoing.packets.rate_cmaui_port_11_test_nested2: + - test_nested2 + - network.outgoing.packets.rate_cmaui_port_11 + disk.device.write.requests_server_cmaui_test_nested2: + - test_nested2 + - disk.device.write.requests_server_cmaui + network.outgoing.bytes_cmaui_port_22_test_nested2: + - test_nested2 + - network.outgoing.bytes_cmaui_port_22 + memory.resident_server_cmaui: + - server_cmaui + - memory.resident + disk.latency_server_cmaui: + - server_cmaui + - disk.latency + vcpus_server_cmaui: + - server_cmaui + - vcpus + network.outgoing.bytes.rate_cmaui_port_22_test_nested2: + - test_nested2 + - network.outgoing.bytes.rate_cmaui_port_22 + disk.device.write.bytes_server_cmaui: + - server_cmaui + - disk.device.write.bytes + network.incoming.bytes.rate_cmaui_port_1: + - cmaui_port_1 + - network.incoming.bytes.rate + network.incoming.bytes.rate_cmaui_port_2: + - cmaui_port_2 + - network.incoming.bytes.rate + disk.root.size_server_cmaui_test_nested2: + - test_nested2 + - disk.root.size_server_cmaui + disk.allocation_server_cmaui: + - server_cmaui + - disk.allocation + disk.write.requests_server_cmaui: + - server_cmaui + - disk.write.requests + network.outpoing.packets_cmaui_port_1: + - cmaui_port_1 + - network.outpoing.packets + network.outpoing.packets_cmaui_port_2: + - cmaui_port_2 + - network.outpoing.packets + network.incoming.packets_cmaui_port_22_test_nested2: + - test_nested2 + - network.incoming.packets_cmaui_port_22 + network.incoming.bytes_cmaui_port_22_test_nested2: + - test_nested2 + - network.incoming.bytes_cmaui_port_22 + cpu.delta_server_cmaui_test_nested2: + - test_nested2 + - cpu.delta_server_cmaui + network.outpoing.packets_cmaui_port_22_test_nested2: + - test_nested2 + - network.outpoing.packets_cmaui_port_22 + endpoint_server_cmaui: + - server_cmaui + - endpoint + feature_cmaui_port_11_test_nested2: + - test_nested2 + - feature_cmaui_port_11 + attachment_cmaui_port_11_test_nested2: + - test_nested2 + - attachment_cmaui_port_11 + disk.device.capacity_server_cmaui_test_nested2: + - test_nested2 + - disk.device.capacity_server_cmaui requirements: - local_storage_server_cmaui_test_nested2: + dependency_cmaui_port_22_test_nested2: - test_nested2 - - local_storage_server_cmaui - local_storage_server_cmaui: + - dependency_cmaui_port_22 + dependency_server_cmaui: - server_cmaui - - local_storage + - dependency + dependency_server_cmaui_test_nested2: + - test_nested2 + - dependency_server_cmaui link_cmaui_port_22_test_nested2: - test_nested2 - link_cmaui_port_22 + dependency_cmaui_port_11_test_nested2: + - test_nested2 + - dependency_cmaui_port_11 link_cmaui_port_2: - cmaui_port_2 - link + link_cmaui_port_1: + - cmaui_port_1 + - link + local_storage_server_cmaui_test_nested2: + - test_nested2 + - local_storage_server_cmaui + local_storage_server_cmaui: + - server_cmaui + - local_storage + dependency_test_nested2: + - test_nested2 + - dependency + dependency_cmaui_port_1: + - cmaui_port_1 + - dependency link_cmaui_port_11_test_nested2: - test_nested2 - link_cmaui_port_11 - link_cmaui_port_1: - - cmaui_port_1 - - link
\ No newline at end of file + dependency_cmaui_port_2: + - cmaui_port_2 + - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/inputs/addOn.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/inputs/addOn.yml index 0e7619a478..8edf20cafd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/inputs/addOn.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/inputs/addOn.yml @@ -24,3 +24,11 @@ resources: properties: shared_security_group_id1: { get_param: shared_security_group_id1} p2: { get_param: shared_security_group_id2} + + packet_mirror_network: + type: OS::Neutron::Net + depends_on: + - test_nested + properties: + name: {get_param: jsa_net_name} + shared: { get_attr: [test_nested]}
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/inputs/nested.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/inputs/nested.yml index b202fef7b0..ce299b2cf5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/inputs/nested.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/inputs/nested.yml @@ -57,9 +57,14 @@ resources: networks: - port: { get_resource: cmaui_port_1 } - port: { get_resource: cmaui_port_2 } + metadata: { get_attr: [test_nested2 , availability_zone_0] } test_nested2: type: nested2level.yml properties: shared_security_group_id1: { get_param: shared_security_group_id1} - p2: { get_param: p2}
\ No newline at end of file + p2: { get_param: p2} + +outputs: + output_attr_1: + value: {get_attr: [test_nested2 , availability_zone_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/heat/nested/nested3levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 9aaa8caf18..c139b7e94d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -2,32 +2,8 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: GlobalSubstitutionTypes imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml +- openecomp_heat_index: + file: openecomp-heat/_index.yml node_types: org.openecomp.resource.abstract.nodes.heat.nested: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute @@ -35,65 +11,132 @@ node_types: cmaui_names: type: list description: CMAUI1, CMAUI2 server names + required: true + status: SUPPORTED entry_schema: type: string p2: type: string description: UID of OAM network + required: true + status: SUPPORTED cmaui_image: type: string description: Image for CMAUI server + required: true + status: SUPPORTED cmaui_flavor: type: string description: Flavor for CMAUI server + required: true + status: SUPPORTED availability_zone_0: type: string description: availabilityzone name + required: true + status: SUPPORTED cmaui_oam_ips: type: string description: cmaui_port_1 + required: true + status: SUPPORTED net: type: string description: UID of OAM network + required: true + status: SUPPORTED shared_security_group_id1: type: string description: UID of OAM network + required: true + status: SUPPORTED requirements: + - dependency_cmaui_port_2: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_cmaui_port_2: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_test_nested2: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - dependency_cmaui_port_11_test_nested2: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_cmaui_port_11_test_nested2: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_cmaui_port_22_test_nested2: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_cmaui_port_22_test_nested2: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_test_nested3_test_nested2: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - dependency_cmaui_port_11_test_nested3_test_nested2: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_cmaui_port_11_test_nested3_test_nested2: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_cmaui_port_22_test_nested3_test_nested2: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_cmaui_port_22_test_nested3_test_nested2: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_server_cmaui_test_nested3_test_nested2: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - local_storage_server_cmaui_test_nested3_test_nested2: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage @@ -101,6 +144,13 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_server_cmaui_test_nested2: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - local_storage_server_cmaui_test_nested2: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage @@ -108,6 +158,13 @@ node_types: 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 @@ -115,29 +172,597 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_cmaui_port_1: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_cmaui_port_1: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 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: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_cmaui_port_22_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.allocation_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_server_cmaui_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_test_nested3_test_nested2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.write.requests.rate_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.capacity_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + scalable_server_cmaui: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + disk.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. + occurrences: + - 1 + - UNBOUNDED + disk.latency_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes.rate_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory_server_cmaui_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + instance_server_cmaui_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + host_server_cmaui: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent + occurrences: + - 1 + - UNBOUNDED + cpu_util_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_cmaui_port_11_test_nested2: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + endpoint_server_cmaui_test_nested2: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_cmaui_port_11_test_nested3_test_nested2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_cmaui_port_22_test_nested3_test_nested2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.write.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. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_cmaui_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_cmaui_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.usage_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_cmaui_port_11_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.iops_server_cmaui_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_cmaui_port_11_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests_server_cmaui_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + instance_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_util_server_cmaui_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.root.size_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_cmaui_port_22_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_cmaui_port_22_test_nested2: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.allocation_server_cmaui_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_server_cmaui_test_nested2: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + disk.capacity_server_cmaui_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + os_server_cmaui_test_nested3_test_nested2: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_cmaui_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED 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. + occurrences: + - 1 + - UNBOUNDED binding_server_cmaui_test_nested3_test_nested2: type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED + disk.ephemeral.size_server_cmaui_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.requests.rate_server_cmaui_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.allocation_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_cmaui_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_cmaui_port_11_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_cmaui_port_22_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.requests_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_cmaui_port_22_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.requests_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_cmaui_port_11_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + os_server_cmaui_test_nested2: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + feature_cmaui_port_22_test_nested2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + cpu_util_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_server_cmaui: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + binding_cmaui_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + binding_cmaui_port_2: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.iops_server_cmaui_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.allocation_server_cmaui_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_cmaui_port_22_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_cmaui_port_22_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_cmaui_port_22_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + vcpus_server_cmaui_test_nested2: + type: org.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: + type: org.openecomp.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: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.root.size_server_cmaui_test_nested3_test_nested2: + type: org.openecomp.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: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests.rate_server_cmaui_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.resident_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_server_cmaui_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_cmaui_port_22_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_cmaui_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.requests_server_cmaui_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.latency_server_cmaui_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_cmaui_port_11_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.iops_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + host_server_cmaui_test_nested2: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent + occurrences: + - 1 + - UNBOUNDED + disk.usage_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.iops_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_cmaui_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_cmaui_port_11_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes_server_cmaui_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_cmaui_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes.rate_server_cmaui_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_cmaui_port_22_test_nested3_test_nested2: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.ephemeral.size_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_cmaui_port_11_test_nested3_test_nested2: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.read.requests_server_cmaui_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED scalable_server_cmaui_test_nested3_test_nested2: type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED + network.incoming.packets_cmaui_port_11_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_cmaui_port_11_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + vcpus_server_cmaui_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED host_server_cmaui_test_nested3_test_nested2: type: tosca.capabilities.Container valid_source_types: @@ -145,50 +770,375 @@ node_types: occurrences: - 1 - UNBOUNDED - scalable_server_cmaui: + disk.device.read.requests.rate_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_cmaui_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + 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: + - 1 + - UNBOUNDED + cpu_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_cmaui_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_cmaui_port_2: + type: tosca.capabilities.Node + 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. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_cmaui_port_22_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_cmaui_port_11_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_cmaui_port_11_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + attachment_cmaui_port_2: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + scalable_server_cmaui_test_nested2: type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_22_test_nested3_test_nested2: + feature_test_nested2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.latency_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. + occurrences: + - 1 + - UNBOUNDED + attachment_cmaui_port_22_test_nested2: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - host_server_cmaui: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + 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. occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_11_test_nested3_test_nested2: + 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 + network.outgoing.packets.rate_cmaui_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.allocation_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.usage_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. + occurrences: + - 1 + - UNBOUNDED + attachment_cmaui_port_1: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - endpoint_server_cmaui: - type: tosca.capabilities.Endpoint.Admin + memory_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_11_test_nested2: + 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. + occurrences: + - 1 + - UNBOUNDED + disk.write.requests.rate_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_cmaui_port_11_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_cmaui_port_22_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes.rate_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. + occurrences: + - 1 + - UNBOUNDED + disk.usage_server_cmaui_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.latency_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_cmaui_port_11_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.latency_server_cmaui_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes.rate_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + instance_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. + occurrences: + - 1 + - UNBOUNDED + attachment_cmaui_port_11_test_nested3_test_nested2: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED + network.incoming.bytes_cmaui_port_22_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes.rate_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.usage_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED binding_server_cmaui: type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_2: + disk.iops_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.usage_server_cmaui_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_server_cmaui_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.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 + network.incoming.packets.rate_cmaui_port_11_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_server_cmaui_test_nested2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes_server_cmaui_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests.rate_server_cmaui_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.iops_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests.rate_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_cmaui_port_11_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_server_cmaui_test_nested3_test_nested2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_server_cmaui_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + attachment_cmaui_port_22_test_nested3_test_nested2: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - endpoint_server_cmaui_test_nested2: - type: tosca.capabilities.Endpoint.Admin + disk.device.write.requests_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_cmaui_port_22_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu.delta_server_cmaui_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -197,87 +1147,250 @@ node_types: occurrences: - 1 - UNBOUNDED - scalable_server_cmaui_test_nested2: - type: tosca.capabilities.Scalable + 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. occurrences: - 1 - UNBOUNDED - host_server_cmaui_test_nested2: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + disk.device.write.bytes.rate_server_cmaui_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_server_cmaui_test_nested2: - type: tosca.capabilities.network.Bindable + disk.device.usage_server_cmaui_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - os_server_cmaui_test_nested2: - type: tosca.capabilities.OperatingSystem + 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 - attachment_cmaui_port_22_test_nested2: - type: tosca.capabilities.Attachment + vcpus_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 - os_server_cmaui_test_nested3_test_nested2: - type: tosca.capabilities.OperatingSystem + network.outgoing.bytes.rate_cmaui_port_22_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_1: + disk.device.write.bytes_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_cmaui_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_cmaui_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes.rate_server_cmaui_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes.rate_server_cmaui_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.root.size_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.resident_server_cmaui_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. + occurrences: + - 1 + - UNBOUNDED + disk.write.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. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_cmaui_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_cmaui_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_cmaui_port_22_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_cmaui_port_22_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu.delta_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_cmaui_port_11_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_cmaui_port_22_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests_server_cmaui_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + endpoint_server_cmaui: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + feature_cmaui_port_11_test_nested2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + attachment_cmaui_port_11_test_nested2: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_cmaui_port_11_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_server_cmaui_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED org.openecomp.resource.abstract.nodes.heat.nested3level: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute properties: cmaui_names: type: list description: CMAUI1, CMAUI2 server names + required: true + status: SUPPORTED entry_schema: type: string p2: type: string description: UID of OAM network + required: true + status: SUPPORTED cmaui_image: type: string description: Image for CMAUI server + required: true + status: SUPPORTED cmaui_flavor: type: string description: Flavor for CMAUI server + required: true + status: SUPPORTED availability_zone_0: type: string description: availabilityzone name + required: true + status: SUPPORTED cmaui_oam_ips: type: string description: cmaui_port_1 + required: true + status: SUPPORTED net: type: string description: UID of OAM network + required: true + status: SUPPORTED shared_security_group_id1: type: string description: UID of OAM network + required: true + status: SUPPORTED requirements: + - dependency_cmaui_port_11: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_cmaui_port_11: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_cmaui_port_22: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_cmaui_port_22: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo 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 @@ -286,6 +1399,72 @@ node_types: - 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: + type: org.openecomp.capabilities.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 + network.outpoing.packets_cmaui_port_11: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_cmaui_port_22: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_cmaui_port_22: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + scalable_server_cmaui: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + disk.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. + 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: + type: org.openecomp.capabilities.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. + occurrences: + - 1 + - UNBOUNDED host_server_cmaui: type: tosca.capabilities.Container valid_source_types: @@ -293,13 +1472,155 @@ node_types: occurrences: - 1 - UNBOUNDED + cpu_util_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_cmaui_port_22: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.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 + disk.device.write.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. + 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. + 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. + occurrences: + - 1 + - UNBOUNDED + disk.usage_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_cmaui_port_22: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. + occurrences: + - 1 + - UNBOUNDED + disk.write.requests.rate_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_cmaui_port_22: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. + occurrences: + - 1 + - UNBOUNDED + instance_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. + occurrences: + - 1 + - UNBOUNDED + feature_cmaui_port_22: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.root.size_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_cmaui_port_22: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_server_cmaui: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + disk.device.read.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.write.bytes_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED os_server_cmaui: type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_11: - type: tosca.capabilities.Attachment + 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. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_cmaui_port_11: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_cmaui_port_11: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -308,18 +1629,145 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_cmaui_port_11: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_cmaui_port_11: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_cmaui_port_22: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 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. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_cmaui_port_22: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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 + vcpus_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.bytes_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. + occurrences: + - 1 + - UNBOUNDED + disk.write.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. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_cmaui_port_11: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_cmaui_port_11: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + memory.usage_server_cmaui: + type: org.openecomp.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: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + attachment_cmaui_port_11: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_cmaui_port_11: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED endpoint_server_cmaui: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - binding_server_cmaui: - type: tosca.capabilities.network.Bindable + network.outgoing.bytes_cmaui_port_22: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - scalable_server_cmaui: - type: tosca.capabilities.Scalable + disk.iops_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_cmaui_port_11: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.iops_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_cmaui_port_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.bytes_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -329,58 +1777,112 @@ node_types: cmaui_names: type: list description: CMAUI1, CMAUI2 server names + required: true + status: SUPPORTED entry_schema: type: string p2: type: string description: UID of OAM network + required: true + status: SUPPORTED cmaui_image: type: string description: Image for CMAUI server + required: true + status: SUPPORTED cmaui_flavor: type: string description: Flavor for CMAUI server + required: true + status: SUPPORTED availability_zone_0: type: string description: availabilityzone name + required: true + status: SUPPORTED cmaui_oam_ips: type: string description: cmaui_port_1 + required: true + status: SUPPORTED net: type: string description: UID of OAM network + required: true + status: SUPPORTED shared_security_group_id1: type: string description: UID of OAM network + required: true + status: SUPPORTED requirements: + - dependency_cmaui_port_11: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_cmaui_port_11: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_cmaui_port_22: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_cmaui_port_22: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_test_nested3: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - dependency_cmaui_port_11_test_nested3: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_cmaui_port_11_test_nested3: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_cmaui_port_22_test_nested3: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_cmaui_port_22_test_nested3: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_server_cmaui_test_nested3: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - local_storage_server_cmaui_test_nested3: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage @@ -388,6 +1890,13 @@ node_types: 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 @@ -396,18 +1905,33 @@ node_types: - 0 - UNBOUNDED capabilities: - os_server_cmaui: - type: tosca.capabilities.OperatingSystem + 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 - attachment_cmaui_port_22_test_nested3: - type: tosca.capabilities.Attachment + 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 - attachment_cmaui_port_11_test_nested3: - type: tosca.capabilities.Attachment + 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.write.requests.rate_server_cmaui_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.capacity_server_cmaui_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -416,6 +1940,30 @@ node_types: occurrences: - 1 - UNBOUNDED + disk.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. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_cmaui_port_22_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.latency_server_cmaui_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes.rate_server_cmaui_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED host_server_cmaui: type: tosca.capabilities.Container valid_source_types: @@ -423,35 +1971,145 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_11: - type: tosca.capabilities.Attachment + cpu_util_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_22: - type: tosca.capabilities.Attachment + network.incoming.packets.rate_cmaui_port_22: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - host_server_cmaui_test_nested3: - type: tosca.capabilities.Container + binding_cmaui_port_11_test_nested3: + type: tosca.capabilities.network.Bindable valid_source_types: - - tosca.nodes.SoftwareComponent + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - endpoint_server_cmaui: + endpoint_server_cmaui_test_nested3: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - binding_server_cmaui: + disk.device.read.bytes_server_cmaui_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.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. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_cmaui_port_11_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.usage_server_cmaui_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + instance_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.root.size_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_cmaui_port_22: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_cmaui_port_22_test_nested3: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + binding_server_cmaui_test_nested3: type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - endpoint_server_cmaui_test_nested3: - type: tosca.capabilities.Endpoint.Admin + network.incoming.bytes.rate_cmaui_port_22_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. + occurrences: + - 1 + - UNBOUNDED + disk.allocation_server_cmaui_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.requests_server_cmaui_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_cmaui_port_11: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_cmaui_port_11: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.requests_server_cmaui_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_cmaui_port_11: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_cmaui_port_11_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -460,8 +2118,199 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_server_cmaui_test_nested3: + feature_cmaui_port_22_test_nested3: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + cpu_util_server_cmaui_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_server_cmaui: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.usage_server_cmaui_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes_server_cmaui_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.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. + occurrences: + - 1 + - UNBOUNDED + vcpus_server_cmaui_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.ephemeral.size_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_cmaui_port_22_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.resident_server_cmaui_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_cmaui_port_11: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + host_server_cmaui_test_nested3: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_cmaui_port_22: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_cmaui_port_11_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_cmaui_port_11_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.iops_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.iops_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_cmaui_port_11_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_server_cmaui_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.ephemeral.size_server_cmaui_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_cmaui_port_11: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_cmaui_port_22: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_cmaui_port_22: type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + attachment_cmaui_port_11_test_nested3: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests.rate_server_cmaui_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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: + type: org.openecomp.capabilities.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. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_server_cmaui_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_test_nested3: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_cmaui_port_11_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes_server_cmaui_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -469,4 +2318,339 @@ node_types: type: tosca.capabilities.Scalable occurrences: - 1 + - UNBOUNDED + disk.device.latency_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. + 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. + occurrences: + - 1 + - UNBOUNDED + disk.usage_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.allocation_server_cmaui_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_cmaui_port_22: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + attachment_cmaui_port_22_test_nested3: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + memory_server_cmaui_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. + occurrences: + - 1 + - UNBOUNDED + disk.write.requests.rate_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests_server_cmaui_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_cmaui_port_22: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_cmaui_port_11_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes.rate_server_cmaui_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.latency_server_cmaui_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + instance_server_cmaui_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes.rate_server_cmaui_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. + occurrences: + - 1 + - UNBOUNDED + feature_cmaui_port_22: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes.rate_server_cmaui_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.usage_server_cmaui_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_server_cmaui: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + disk.iops_server_cmaui_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.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.write.bytes_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_cmaui_port_11: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_server_cmaui_test_nested3: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests.rate_server_cmaui_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_cmaui_port_11_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests_server_cmaui_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_cmaui_port_22_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_cmaui_port_22_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + attachment_cmaui_port_22: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_cmaui_port_22_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_cmaui_port_22: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 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. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_cmaui_port_22: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.iops_server_cmaui_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_cmaui_port_22_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.root.size_server_cmaui_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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 + vcpus_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.bytes_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. + occurrences: + - 1 + - UNBOUNDED + disk.write.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. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_cmaui_port_11: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_cmaui_port_11: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + cpu.delta_server_cmaui_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_cmaui_port_22_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + attachment_cmaui_port_11: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + endpoint_server_cmaui: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + feature_cmaui_port_11_test_nested3: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_cmaui_port_11: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_cmaui_port_11: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_server_cmaui_test_nested3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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/heat/nested/nested3levels/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/MainServiceTemplate.yaml index b619c99256..9d3f823368 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/MainServiceTemplate.yaml @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: Main imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml topology_template: inputs: security_group_name: @@ -131,9 +107,25 @@ topology_template: node: test_nested relationship: org.openecomp.relationships.AttachesTo - port: + capability: attachment_cmaui_port_22_test_nested2 + node: test_nested + relationship: org.openecomp.relationships.AttachesTo + - port: capability: attachment_cmaui_port_1 node: test_nested relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_cmaui_port_11_test_nested3_test_nested2 + node: test_nested + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_cmaui_port_22_test_nested3_test_nested2 + node: test_nested + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_cmaui_port_11_test_nested2 + node: test_nested + relationship: org.openecomp.relationships.AttachesTo jsa_security_group2: type: org.openecomp.resource.vfc.rules.nodes.heat.network.neutron.SecurityRules properties: @@ -210,6 +202,14 @@ topology_template: capability: attachment_cmaui_port_1 node: test_nested relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_cmaui_port_11_test_nested3_test_nested2 + node: test_nested + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_cmaui_port_11_test_nested2 + node: test_nested + relationship: org.openecomp.relationships.AttachesTo test_nested: type: org.openecomp.resource.abstract.nodes.heat.nested directives: @@ -222,20 +222,20 @@ topology_template: shared_security_group_id1: get_input: shared_security_group_id1 groups: - addOn: + base_group: type: org.openecomp.groups.heat.HeatStack properties: - heat_file: ../Artifacts/addOn.yml + heat_file: ../Artifacts/base.yml description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - test_nested - base: + - jsa_security_group1 + - jsa_security_group2 + addOn_group: type: org.openecomp.groups.heat.HeatStack properties: - heat_file: ../Artifacts/base.yml + heat_file: ../Artifacts/addOn.yml description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - jsa_security_group1 - - jsa_security_group2
\ No newline at end of file + - test_nested
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested2levelServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested2levelServiceTemplate.yaml index 2c64802a2b..334da11673 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested2levelServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested2levelServiceTemplate.yaml @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: nested2level imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml node_types: org.openecomp.resource.vfc.nodes.heat.cmaui: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server @@ -83,6 +59,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: shared_security_group_id1 - get_input: p2 @@ -91,6 +73,9 @@ topology_template: get_input: - cmaui_oam_ips - 0 + mac_requirements: + mac_count_required: + is_required: false network: get_input: net requirements: @@ -102,6 +87,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: shared_security_group_id1 fixed_ips: @@ -109,6 +100,9 @@ topology_template: get_input: - cmaui_oam_ips - 0 + mac_requirements: + mac_count_required: + is_required: false network: get_input: net requirements: @@ -141,7 +135,7 @@ topology_template: - cmaui_names - 0 groups: - nested2level: + nested2level_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/nested2level.yml @@ -154,49 +148,403 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested2level capabilities: - os_server_cmaui: + cpu.delta_server_cmaui: - server_cmaui - - os - attachment_cmaui_port_22_test_nested3: + - cpu.delta + disk.device.write.requests.rate_server_cmaui: + - server_cmaui + - disk.device.write.requests.rate + disk.device.allocation_server_cmaui: + - server_cmaui + - disk.device.allocation + disk.write.requests.rate_server_cmaui_test_nested3: - test_nested3 - - attachment_cmaui_port_22 - attachment_cmaui_port_11_test_nested3: + - disk.write.requests.rate_server_cmaui + disk.capacity_server_cmaui_test_nested3: - test_nested3 - - attachment_cmaui_port_11 + - disk.capacity_server_cmaui scalable_server_cmaui: - server_cmaui - scalable + disk.read.bytes.rate_server_cmaui: + - server_cmaui + - disk.read.bytes.rate + network.incoming.packets.rate_cmaui_port_22_test_nested3: + - test_nested3 + - network.incoming.packets.rate_cmaui_port_22 + disk.latency_server_cmaui_test_nested3: + - test_nested3 + - disk.latency_server_cmaui + disk.read.bytes.rate_server_cmaui_test_nested3: + - test_nested3 + - disk.read.bytes.rate_server_cmaui host_server_cmaui: - server_cmaui - host - attachment_cmaui_port_11: - - cmaui_port_11 - - attachment - attachment_cmaui_port_22: + cpu_util_server_cmaui: + - server_cmaui + - cpu_util + network.incoming.packets.rate_cmaui_port_22: - cmaui_port_22 - - attachment + - network.incoming.packets.rate + binding_cmaui_port_11_test_nested3: + - test_nested3 + - binding_cmaui_port_11 + endpoint_server_cmaui_test_nested3: + - test_nested3 + - endpoint_server_cmaui + disk.device.read.bytes_server_cmaui_test_nested3: + - test_nested3 + - disk.device.read.bytes_server_cmaui + disk.device.write.requests_server_cmaui: + - server_cmaui + - disk.device.write.requests + network.incoming.packets.rate_cmaui_port_11_test_nested3: + - test_nested3 + - network.incoming.packets.rate_cmaui_port_11 + memory.usage_server_cmaui_test_nested3: + - test_nested3 + - memory.usage_server_cmaui + instance_server_cmaui: + - server_cmaui + - instance + disk.device.read.bytes_server_cmaui: + - server_cmaui + - disk.device.read.bytes + disk.root.size_server_cmaui: + - server_cmaui + - disk.root.size + network.incoming.bytes.rate_cmaui_port_22: + - cmaui_port_22 + - network.incoming.bytes.rate + binding_cmaui_port_22_test_nested3: + - test_nested3 + - binding_cmaui_port_22 + binding_server_cmaui_test_nested3: + - test_nested3 + - binding_server_cmaui + network.incoming.bytes.rate_cmaui_port_22_test_nested3: + - test_nested3 + - network.incoming.bytes.rate_cmaui_port_22 + os_server_cmaui: + - server_cmaui + - os + disk.device.write.bytes.rate_server_cmaui: + - server_cmaui + - disk.device.write.bytes.rate + disk.allocation_server_cmaui_test_nested3: + - test_nested3 + - disk.allocation_server_cmaui + disk.read.requests_server_cmaui_test_nested3: + - test_nested3 + - disk.read.requests_server_cmaui + feature_cmaui_port_11: + - cmaui_port_11 + - feature + network.incoming.bytes.rate_cmaui_port_11: + - cmaui_port_11 + - network.incoming.bytes.rate + disk.write.requests_server_cmaui_test_nested3: + - test_nested3 + - disk.write.requests_server_cmaui + network.outgoing.bytes_cmaui_port_11: + - cmaui_port_11 + - network.outgoing.bytes + network.outpoing.packets_cmaui_port_11_test_nested3: + - test_nested3 + - network.outpoing.packets_cmaui_port_11 + os_server_cmaui_test_nested3: + - test_nested3 + - os_server_cmaui + feature_cmaui_port_22_test_nested3: + - test_nested3 + - feature_cmaui_port_22 + cpu_util_server_cmaui_test_nested3: + - test_nested3 + - cpu_util_server_cmaui + feature_server_cmaui: + - server_cmaui + - feature + disk.usage_server_cmaui_test_nested3: + - test_nested3 + - disk.usage_server_cmaui + disk.write.bytes_server_cmaui_test_nested3: + - test_nested3 + - disk.write.bytes_server_cmaui + memory.usage_server_cmaui: + - server_cmaui + - memory.usage + vcpus_server_cmaui_test_nested3: + - test_nested3 + - vcpus_server_cmaui + disk.ephemeral.size_server_cmaui: + - server_cmaui + - disk.ephemeral.size + network.outgoing.packets.rate_cmaui_port_22_test_nested3: + - test_nested3 + - network.outgoing.packets.rate_cmaui_port_22 + memory.resident_server_cmaui_test_nested3: + - test_nested3 + - memory.resident_server_cmaui + network.incoming.packets.rate_cmaui_port_11: + - cmaui_port_11 + - network.incoming.packets.rate host_server_cmaui_test_nested3: - test_nested3 - host_server_cmaui - endpoint_server_cmaui: + network.outgoing.bytes_cmaui_port_22: + - cmaui_port_22 + - network.outgoing.bytes + network.incoming.packets_cmaui_port_11_test_nested3: + - test_nested3 + - network.incoming.packets_cmaui_port_11 + network.incoming.bytes_cmaui_port_11_test_nested3: + - test_nested3 + - network.incoming.bytes_cmaui_port_11 + disk.iops_server_cmaui: - server_cmaui - - endpoint - binding_server_cmaui: + - disk.iops + disk.device.iops_server_cmaui: + - server_cmaui + - disk.device.iops + network.outgoing.bytes.rate_cmaui_port_11_test_nested3: + - test_nested3 + - network.outgoing.bytes.rate_cmaui_port_11 + disk.read.bytes_server_cmaui: - server_cmaui + - disk.read.bytes + cpu_server_cmaui_test_nested3: + - test_nested3 + - cpu_server_cmaui + disk.ephemeral.size_server_cmaui_test_nested3: + - test_nested3 + - disk.ephemeral.size_server_cmaui + network.outpoing.packets_cmaui_port_11: + - cmaui_port_11 + - network.outpoing.packets + network.outgoing.packets.rate_cmaui_port_22: + - cmaui_port_22 + - network.outgoing.packets.rate + binding_cmaui_port_22: + - cmaui_port_22 - binding - endpoint_server_cmaui_test_nested3: + attachment_cmaui_port_11_test_nested3: - test_nested3 - - endpoint_server_cmaui - os_server_cmaui_test_nested3: + - attachment_cmaui_port_11 + disk.device.read.requests.rate_server_cmaui_test_nested3: - test_nested3 - - os_server_cmaui - binding_server_cmaui_test_nested3: + - disk.device.read.requests.rate_server_cmaui + cpu_server_cmaui: + - server_cmaui + - cpu + disk.write.bytes.rate_server_cmaui: + - server_cmaui + - disk.write.bytes.rate + disk.device.read.bytes.rate_server_cmaui: + - server_cmaui + - disk.device.read.bytes.rate + disk.device.write.bytes_server_cmaui_test_nested3: - test_nested3 - - binding_server_cmaui + - disk.device.write.bytes_server_cmaui + feature_test_nested3: + - test_nested3 + - feature + network.incoming.bytes.rate_cmaui_port_11_test_nested3: + - test_nested3 + - network.incoming.bytes.rate_cmaui_port_11 + disk.read.bytes_server_cmaui_test_nested3: + - test_nested3 + - disk.read.bytes_server_cmaui scalable_server_cmaui_test_nested3: - test_nested3 - scalable_server_cmaui + disk.device.latency_server_cmaui: + - server_cmaui + - disk.device.latency + disk.read.requests_server_cmaui: + - server_cmaui + - disk.read.requests + disk.device.capacity_server_cmaui: + - server_cmaui + - disk.device.capacity + disk.usage_server_cmaui: + - server_cmaui + - disk.usage + disk.device.allocation_server_cmaui_test_nested3: + - test_nested3 + - disk.device.allocation_server_cmaui + disk.device.usage_server_cmaui: + - server_cmaui + - disk.device.usage + network.outgoing.bytes.rate_cmaui_port_22: + - cmaui_port_22 + - network.outgoing.bytes.rate + attachment_cmaui_port_22_test_nested3: + - test_nested3 + - attachment_cmaui_port_22 + memory_server_cmaui_test_nested3: + - test_nested3 + - memory_server_cmaui + disk.capacity_server_cmaui: + - server_cmaui + - disk.capacity + disk.write.requests.rate_server_cmaui: + - server_cmaui + - disk.write.requests.rate + disk.device.read.requests_server_cmaui_test_nested3: + - test_nested3 + - disk.device.read.requests_server_cmaui + network.outpoing.packets_cmaui_port_22: + - cmaui_port_22 + - network.outpoing.packets + network.outgoing.bytes_cmaui_port_11_test_nested3: + - test_nested3 + - network.outgoing.bytes_cmaui_port_11 + disk.device.read.requests_server_cmaui: + - server_cmaui + - disk.device.read.requests + disk.device.read.bytes.rate_server_cmaui_test_nested3: + - test_nested3 + - disk.device.read.bytes.rate_server_cmaui + disk.device.latency_server_cmaui_test_nested3: + - test_nested3 + - disk.device.latency_server_cmaui + instance_server_cmaui_test_nested3: + - test_nested3 + - instance_server_cmaui + disk.device.write.bytes.rate_server_cmaui_test_nested3: + - test_nested3 + - disk.device.write.bytes.rate_server_cmaui + memory_server_cmaui: + - server_cmaui + - memory + feature_cmaui_port_22: + - cmaui_port_22 + - feature + disk.write.bytes.rate_server_cmaui_test_nested3: + - test_nested3 + - disk.write.bytes.rate_server_cmaui + disk.device.usage_server_cmaui_test_nested3: + - test_nested3 + - disk.device.usage_server_cmaui + binding_server_cmaui: + - server_cmaui + - binding + disk.iops_server_cmaui_test_nested3: + - test_nested3 + - disk.iops_server_cmaui + disk.device.read.requests.rate_server_cmaui: + - server_cmaui + - disk.device.read.requests.rate + disk.write.bytes_server_cmaui: + - server_cmaui + - disk.write.bytes + network.outgoing.bytes.rate_cmaui_port_11: + - cmaui_port_11 + - network.outgoing.bytes.rate + feature_server_cmaui_test_nested3: + - test_nested3 + - feature_server_cmaui + disk.device.write.requests.rate_server_cmaui_test_nested3: + - test_nested3 + - disk.device.write.requests.rate_server_cmaui + network.outgoing.packets.rate_cmaui_port_11_test_nested3: + - test_nested3 + - network.outgoing.packets.rate_cmaui_port_11 + disk.device.write.requests_server_cmaui_test_nested3: + - test_nested3 + - disk.device.write.requests_server_cmaui + network.incoming.packets_cmaui_port_22_test_nested3: + - test_nested3 + - network.incoming.packets_cmaui_port_22 + network.incoming.bytes_cmaui_port_22_test_nested3: + - test_nested3 + - network.incoming.bytes_cmaui_port_22 + attachment_cmaui_port_22: + - cmaui_port_22 + - attachment + network.outgoing.bytes_cmaui_port_22_test_nested3: + - test_nested3 + - network.outgoing.bytes_cmaui_port_22 + network.incoming.packets_cmaui_port_22: + - cmaui_port_22 + - network.incoming.packets + memory.resident_server_cmaui: + - server_cmaui + - memory.resident + network.incoming.bytes_cmaui_port_22: + - cmaui_port_22 + - network.incoming.bytes + disk.device.iops_server_cmaui_test_nested3: + - test_nested3 + - disk.device.iops_server_cmaui + network.outgoing.bytes.rate_cmaui_port_22_test_nested3: + - test_nested3 + - network.outgoing.bytes.rate_cmaui_port_22 + disk.root.size_server_cmaui_test_nested3: + - test_nested3 + - disk.root.size_server_cmaui + disk.latency_server_cmaui: + - server_cmaui + - disk.latency + vcpus_server_cmaui: + - server_cmaui + - vcpus + disk.device.write.bytes_server_cmaui: + - server_cmaui + - disk.device.write.bytes + disk.allocation_server_cmaui: + - server_cmaui + - disk.allocation + disk.write.requests_server_cmaui: + - server_cmaui + - disk.write.requests + network.outgoing.packets.rate_cmaui_port_11: + - cmaui_port_11 + - network.outgoing.packets.rate + binding_cmaui_port_11: + - cmaui_port_11 + - binding + cpu.delta_server_cmaui_test_nested3: + - test_nested3 + - cpu.delta_server_cmaui + network.outpoing.packets_cmaui_port_22_test_nested3: + - test_nested3 + - network.outpoing.packets_cmaui_port_22 + attachment_cmaui_port_11: + - cmaui_port_11 + - attachment + endpoint_server_cmaui: + - server_cmaui + - endpoint + feature_cmaui_port_11_test_nested3: + - test_nested3 + - feature_cmaui_port_11 + network.incoming.packets_cmaui_port_11: + - cmaui_port_11 + - network.incoming.packets + network.incoming.bytes_cmaui_port_11: + - cmaui_port_11 + - network.incoming.bytes + disk.device.capacity_server_cmaui_test_nested3: + - test_nested3 + - disk.device.capacity_server_cmaui requirements: + dependency_server_cmaui: + - server_cmaui + - dependency + dependency_server_cmaui_test_nested3: + - test_nested3 + - dependency_server_cmaui + dependency_cmaui_port_11_test_nested3: + - test_nested3 + - dependency_cmaui_port_11 + link_cmaui_port_22_test_nested3: + - test_nested3 + - link_cmaui_port_22 + dependency_cmaui_port_22_test_nested3: + - test_nested3 + - dependency_cmaui_port_22 local_storage_server_cmaui_test_nested3: - test_nested3 - local_storage_server_cmaui @@ -209,9 +557,15 @@ topology_template: link_cmaui_port_22: - cmaui_port_22 - link - link_cmaui_port_22_test_nested3: + dependency_cmaui_port_11: + - cmaui_port_11 + - dependency + dependency_cmaui_port_22: + - cmaui_port_22 + - dependency + dependency_test_nested3: - test_nested3 - - link_cmaui_port_22 + - dependency link_cmaui_port_11_test_nested3: - test_nested3 - link_cmaui_port_11
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested3levelServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested3levelServiceTemplate.yaml index d270626fa7..1e2f187bff 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested3levelServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested3levelServiceTemplate.yaml @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: nested3level imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml node_types: org.openecomp.resource.vfc.nodes.heat.cmaui: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server @@ -83,6 +59,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: shared_security_group_id1 - get_input: p2 @@ -91,6 +73,9 @@ topology_template: get_input: - cmaui_oam_ips - 0 + mac_requirements: + mac_count_required: + is_required: false network: get_input: net requirements: @@ -102,6 +87,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: shared_security_group_id1 fixed_ips: @@ -109,6 +100,9 @@ topology_template: get_input: - cmaui_oam_ips - 0 + mac_requirements: + mac_count_required: + is_required: false network: get_input: net requirements: @@ -130,7 +124,7 @@ topology_template: - cmaui_names - 0 groups: - nested3level: + nested3level_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/nested3level.yml @@ -142,28 +136,199 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested3level capabilities: + cpu.delta_server_cmaui: + - server_cmaui + - cpu.delta + disk.device.write.requests.rate_server_cmaui: + - server_cmaui + - disk.device.write.requests.rate + disk.device.allocation_server_cmaui: + - server_cmaui + - disk.device.allocation + network.outpoing.packets_cmaui_port_11: + - cmaui_port_11 + - network.outpoing.packets + network.outgoing.packets.rate_cmaui_port_22: + - cmaui_port_22 + - network.outgoing.packets.rate + binding_cmaui_port_22: + - cmaui_port_22 + - binding + scalable_server_cmaui: + - server_cmaui + - scalable + disk.read.bytes.rate_server_cmaui: + - server_cmaui + - disk.read.bytes.rate + cpu_server_cmaui: + - server_cmaui + - cpu + disk.write.bytes.rate_server_cmaui: + - server_cmaui + - disk.write.bytes.rate + disk.device.read.bytes.rate_server_cmaui: + - server_cmaui + - disk.device.read.bytes.rate host_server_cmaui: - server_cmaui - host + cpu_util_server_cmaui: + - server_cmaui + - cpu_util + network.incoming.packets.rate_cmaui_port_22: + - cmaui_port_22 + - network.incoming.packets.rate + disk.device.latency_server_cmaui: + - server_cmaui + - disk.device.latency + disk.device.write.requests_server_cmaui: + - server_cmaui + - disk.device.write.requests + disk.read.requests_server_cmaui: + - server_cmaui + - disk.read.requests + disk.device.capacity_server_cmaui: + - server_cmaui + - disk.device.capacity + disk.usage_server_cmaui: + - server_cmaui + - disk.usage + disk.device.usage_server_cmaui: + - server_cmaui + - disk.device.usage + network.outgoing.bytes.rate_cmaui_port_22: + - cmaui_port_22 + - network.outgoing.bytes.rate + disk.capacity_server_cmaui: + - server_cmaui + - disk.capacity + disk.write.requests.rate_server_cmaui: + - server_cmaui + - disk.write.requests.rate + network.outpoing.packets_cmaui_port_22: + - cmaui_port_22 + - network.outpoing.packets + disk.device.read.requests_server_cmaui: + - server_cmaui + - disk.device.read.requests + instance_server_cmaui: + - server_cmaui + - instance + disk.device.read.bytes_server_cmaui: + - server_cmaui + - disk.device.read.bytes + memory_server_cmaui: + - server_cmaui + - memory + feature_cmaui_port_22: + - cmaui_port_22 + - feature + disk.root.size_server_cmaui: + - server_cmaui + - disk.root.size + network.incoming.bytes.rate_cmaui_port_22: + - cmaui_port_22 + - network.incoming.bytes.rate + 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 - attachment_cmaui_port_11: + disk.device.write.bytes.rate_server_cmaui: + - server_cmaui + - disk.device.write.bytes.rate + network.outgoing.bytes.rate_cmaui_port_11: - cmaui_port_11 - - attachment + - network.outgoing.bytes.rate + feature_cmaui_port_11: + - cmaui_port_11 + - feature attachment_cmaui_port_22: - cmaui_port_22 - attachment + network.incoming.bytes.rate_cmaui_port_11: + - cmaui_port_11 + - network.incoming.bytes.rate + network.outgoing.bytes_cmaui_port_11: + - cmaui_port_11 + - network.outgoing.bytes + network.incoming.packets_cmaui_port_22: + - cmaui_port_22 + - network.incoming.packets + memory.resident_server_cmaui: + - server_cmaui + - memory.resident + network.incoming.bytes_cmaui_port_22: + - cmaui_port_22 + - network.incoming.bytes + disk.latency_server_cmaui: + - server_cmaui + - disk.latency + feature_server_cmaui: + - server_cmaui + - feature + vcpus_server_cmaui: + - server_cmaui + - vcpus + disk.device.write.bytes_server_cmaui: + - server_cmaui + - disk.device.write.bytes + disk.allocation_server_cmaui: + - server_cmaui + - disk.allocation + disk.write.requests_server_cmaui: + - server_cmaui + - disk.write.requests + network.outgoing.packets.rate_cmaui_port_11: + - cmaui_port_11 + - network.outgoing.packets.rate + binding_cmaui_port_11: + - cmaui_port_11 + - binding + memory.usage_server_cmaui: + - server_cmaui + - memory.usage + disk.ephemeral.size_server_cmaui: + - server_cmaui + - disk.ephemeral.size + attachment_cmaui_port_11: + - cmaui_port_11 + - attachment + network.incoming.packets.rate_cmaui_port_11: + - cmaui_port_11 + - network.incoming.packets.rate endpoint_server_cmaui: - server_cmaui - endpoint - binding_server_cmaui: + network.outgoing.bytes_cmaui_port_22: + - cmaui_port_22 + - network.outgoing.bytes + disk.iops_server_cmaui: - server_cmaui - - binding - scalable_server_cmaui: + - disk.iops + network.incoming.packets_cmaui_port_11: + - cmaui_port_11 + - network.incoming.packets + disk.device.iops_server_cmaui: - server_cmaui - - scalable + - disk.device.iops + network.incoming.bytes_cmaui_port_11: + - cmaui_port_11 + - network.incoming.bytes + disk.read.bytes_server_cmaui: + - server_cmaui + - disk.read.bytes requirements: + dependency_server_cmaui: + - server_cmaui + - dependency local_storage_server_cmaui: - server_cmaui - local_storage @@ -172,4 +337,10 @@ topology_template: - link link_cmaui_port_22: - cmaui_port_22 - - link
\ No newline at end of file + - link + dependency_cmaui_port_11: + - cmaui_port_11 + - dependency + dependency_cmaui_port_22: + - cmaui_port_22 + - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nestedServiceTemplate.yaml index d78a252f4f..8b1dfeb095 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nestedServiceTemplate.yaml @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: nested imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml node_types: org.openecomp.resource.vfc.nodes.heat.cmaui: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server @@ -83,6 +59,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: shared_security_group_id1 fixed_ips: @@ -90,6 +72,9 @@ topology_template: get_input: - cmaui_oam_ips - 0 + mac_requirements: + mac_count_required: + is_required: false network: get_input: net requirements: @@ -125,6 +110,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: shared_security_group_id1 - get_input: p2 @@ -133,6 +124,9 @@ topology_template: get_input: - cmaui_oam_ips - 0 + mac_requirements: + mac_count_required: + is_required: false network: get_input: net requirements: @@ -141,7 +135,7 @@ topology_template: node: server_cmaui relationship: tosca.relationships.network.BindsTo groups: - nested: + nested_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/nested.yml @@ -154,94 +148,637 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested capabilities: + cpu.delta_server_cmaui: + - server_cmaui + - cpu.delta + disk.device.write.requests.rate_server_cmaui: + - server_cmaui + - disk.device.write.requests.rate + network.incoming.packets.rate_cmaui_port_22_test_nested2: + - test_nested2 + - network.incoming.packets.rate_cmaui_port_22 + disk.device.allocation_server_cmaui: + - server_cmaui + - disk.device.allocation + disk.device.read.bytes_server_cmaui_test_nested3_test_nested2: + - test_nested2 + - disk.device.read.bytes_server_cmaui_test_nested3 + feature_test_nested3_test_nested2: + - test_nested2 + - feature_test_nested3 + disk.write.requests.rate_server_cmaui_test_nested2: + - test_nested2 + - disk.write.requests.rate_server_cmaui + disk.capacity_server_cmaui_test_nested2: + - test_nested2 + - disk.capacity_server_cmaui + scalable_server_cmaui: + - server_cmaui + - scalable + disk.read.bytes.rate_server_cmaui: + - server_cmaui + - disk.read.bytes.rate + disk.latency_server_cmaui_test_nested2: + - test_nested2 + - disk.latency_server_cmaui + disk.read.bytes.rate_server_cmaui_test_nested2: + - test_nested2 + - disk.read.bytes.rate_server_cmaui + memory_server_cmaui_test_nested3_test_nested2: + - test_nested2 + - memory_server_cmaui_test_nested3 + instance_server_cmaui_test_nested3_test_nested2: + - test_nested2 + - instance_server_cmaui_test_nested3 + host_server_cmaui: + - server_cmaui + - host + cpu_util_server_cmaui: + - server_cmaui + - cpu_util + binding_cmaui_port_11_test_nested2: + - test_nested2 + - binding_cmaui_port_11 + endpoint_server_cmaui_test_nested2: + - test_nested2 + - endpoint_server_cmaui + disk.device.read.bytes_server_cmaui_test_nested2: + - test_nested2 + - disk.device.read.bytes_server_cmaui + feature_cmaui_port_11_test_nested3_test_nested2: + - test_nested2 + - feature_cmaui_port_11_test_nested3 + feature_cmaui_port_22_test_nested3_test_nested2: + - test_nested2 + - feature_cmaui_port_22_test_nested3 + disk.device.write.requests_server_cmaui: + - server_cmaui + - disk.device.write.requests + network.outgoing.bytes_cmaui_port_2: + - cmaui_port_2 + - network.outgoing.bytes + network.outgoing.bytes_cmaui_port_1: + - cmaui_port_1 + - network.outgoing.bytes + memory.usage_server_cmaui_test_nested2: + - test_nested2 + - memory.usage_server_cmaui + network.outpoing.packets_cmaui_port_11_test_nested3_test_nested2: + - test_nested2 + - network.outpoing.packets_cmaui_port_11_test_nested3 + disk.device.iops_server_cmaui_test_nested3_test_nested2: + - test_nested2 + - disk.device.iops_server_cmaui_test_nested3 + network.incoming.packets.rate_cmaui_port_11_test_nested2: + - test_nested2 + - network.incoming.packets.rate_cmaui_port_11 + disk.device.read.requests_server_cmaui_test_nested3_test_nested2: + - test_nested2 + - disk.device.read.requests_server_cmaui_test_nested3 + instance_server_cmaui: + - server_cmaui + - instance + disk.device.read.bytes_server_cmaui: + - server_cmaui + - disk.device.read.bytes + cpu_util_server_cmaui_test_nested3_test_nested2: + - test_nested2 + - cpu_util_server_cmaui_test_nested3 + disk.root.size_server_cmaui: + - server_cmaui + - disk.root.size + network.outgoing.bytes.rate_cmaui_port_22_test_nested3_test_nested2: + - test_nested2 + - network.outgoing.bytes.rate_cmaui_port_22_test_nested3 + binding_cmaui_port_22_test_nested2: + - test_nested2 + - binding_cmaui_port_22 + disk.allocation_server_cmaui_test_nested3_test_nested2: + - test_nested2 + - disk.allocation_server_cmaui_test_nested3 + binding_server_cmaui_test_nested2: + - test_nested2 + - binding_server_cmaui + disk.capacity_server_cmaui_test_nested3_test_nested2: + - test_nested2 + - disk.capacity_server_cmaui_test_nested3 + os_server_cmaui_test_nested3_test_nested2: + - test_nested2 + - os_server_cmaui_test_nested3 + network.incoming.packets_cmaui_port_2: + - cmaui_port_2 + - network.incoming.packets os_server_cmaui: - server_cmaui - os + disk.device.write.bytes.rate_server_cmaui: + - server_cmaui + - disk.device.write.bytes.rate binding_server_cmaui_test_nested3_test_nested2: - test_nested2 - binding_server_cmaui_test_nested3 + disk.ephemeral.size_server_cmaui_test_nested3_test_nested2: + - test_nested2 + - disk.ephemeral.size_server_cmaui_test_nested3 + disk.write.requests.rate_server_cmaui_test_nested3_test_nested2: + - test_nested2 + - disk.write.requests.rate_server_cmaui_test_nested3 + disk.allocation_server_cmaui_test_nested2: + - test_nested2 + - disk.allocation_server_cmaui + network.incoming.packets_cmaui_port_1: + - cmaui_port_1 + - network.incoming.packets + network.outgoing.bytes_cmaui_port_11_test_nested3_test_nested2: + - test_nested2 + - network.outgoing.bytes_cmaui_port_11_test_nested3 + network.incoming.bytes.rate_cmaui_port_22_test_nested2: + - test_nested2 + - network.incoming.bytes.rate_cmaui_port_22 + disk.read.requests_server_cmaui_test_nested2: + - test_nested2 + - disk.read.requests_server_cmaui + network.outgoing.bytes_cmaui_port_22_test_nested3_test_nested2: + - test_nested2 + - network.outgoing.bytes_cmaui_port_22_test_nested3 + disk.write.requests_server_cmaui_test_nested2: + - test_nested2 + - disk.write.requests_server_cmaui + network.outpoing.packets_cmaui_port_11_test_nested2: + - test_nested2 + - network.outpoing.packets_cmaui_port_11 + os_server_cmaui_test_nested2: + - test_nested2 + - os_server_cmaui + feature_cmaui_port_22_test_nested2: + - test_nested2 + - feature_cmaui_port_22 + cpu_util_server_cmaui_test_nested2: + - test_nested2 + - cpu_util_server_cmaui + feature_server_cmaui: + - server_cmaui + - feature + binding_cmaui_port_1: + - cmaui_port_1 + - binding + binding_cmaui_port_2: + - cmaui_port_2 + - binding + disk.iops_server_cmaui_test_nested3_test_nested2: + - test_nested2 + - disk.iops_server_cmaui_test_nested3 + disk.device.allocation_server_cmaui_test_nested3_test_nested2: + - test_nested2 + - disk.device.allocation_server_cmaui_test_nested3 + network.outpoing.packets_cmaui_port_22_test_nested3_test_nested2: + - test_nested2 + - network.outpoing.packets_cmaui_port_22_test_nested3 + network.incoming.packets.rate_cmaui_port_22_test_nested3_test_nested2: + - test_nested2 + - network.incoming.packets.rate_cmaui_port_22_test_nested3 + disk.write.bytes_server_cmaui_test_nested2: + - test_nested2 + - disk.write.bytes_server_cmaui + network.incoming.packets_cmaui_port_22_test_nested3_test_nested2: + - test_nested2 + - network.incoming.packets_cmaui_port_22_test_nested3 + vcpus_server_cmaui_test_nested2: + - test_nested2 + - vcpus_server_cmaui + memory.usage_server_cmaui: + - server_cmaui + - memory.usage + disk.ephemeral.size_server_cmaui: + - server_cmaui + - disk.ephemeral.size + disk.root.size_server_cmaui_test_nested3_test_nested2: + - test_nested2 + - disk.root.size_server_cmaui_test_nested3 + network.outgoing.bytes.rate_cmaui_port_2: + - cmaui_port_2 + - network.outgoing.bytes.rate + disk.device.write.requests.rate_server_cmaui_test_nested3_test_nested2: + - test_nested2 + - disk.device.write.requests.rate_server_cmaui_test_nested3 + cpu_server_cmaui_test_nested2: + - test_nested2 + - cpu_server_cmaui + memory.resident_server_cmaui_test_nested2: + - test_nested2 + - memory.resident_server_cmaui + cpu_server_cmaui_test_nested3_test_nested2: + - test_nested2 + - cpu_server_cmaui_test_nested3 + network.outgoing.packets.rate_cmaui_port_22_test_nested2: + - test_nested2 + - network.outgoing.packets.rate_cmaui_port_22 + network.outgoing.bytes.rate_cmaui_port_1: + - cmaui_port_1 + - network.outgoing.bytes.rate + disk.write.requests_server_cmaui_test_nested3_test_nested2: + - test_nested2 + - disk.write.requests_server_cmaui_test_nested3 + disk.device.latency_server_cmaui_test_nested3_test_nested2: + - test_nested2 + - disk.device.latency_server_cmaui_test_nested3 + network.outgoing.bytes.rate_cmaui_port_11_test_nested2: + - test_nested2 + - network.outgoing.bytes.rate_cmaui_port_11 + disk.iops_server_cmaui: + - server_cmaui + - disk.iops + host_server_cmaui_test_nested2: + - test_nested2 + - host_server_cmaui + disk.usage_server_cmaui_test_nested2: + - test_nested2 + - disk.usage_server_cmaui + disk.device.iops_server_cmaui: + - server_cmaui + - disk.device.iops + network.incoming.bytes_cmaui_port_2: + - cmaui_port_2 + - network.incoming.bytes + network.incoming.bytes.rate_cmaui_port_11_test_nested3_test_nested2: + - test_nested2 + - network.incoming.bytes.rate_cmaui_port_11_test_nested3 + disk.read.bytes_server_cmaui_test_nested3_test_nested2: + - test_nested2 + - disk.read.bytes_server_cmaui_test_nested3 + disk.read.bytes_server_cmaui: + - server_cmaui + - disk.read.bytes + network.incoming.bytes_cmaui_port_1: + - cmaui_port_1 + - network.incoming.bytes + disk.write.bytes.rate_server_cmaui_test_nested3_test_nested2: + - test_nested2 + - disk.write.bytes.rate_server_cmaui_test_nested3 + binding_cmaui_port_22_test_nested3_test_nested2: + - test_nested2 + - binding_cmaui_port_22_test_nested3 + disk.ephemeral.size_server_cmaui_test_nested2: + - test_nested2 + - disk.ephemeral.size_server_cmaui + binding_cmaui_port_11_test_nested3_test_nested2: + - test_nested2 + - binding_cmaui_port_11_test_nested3 + disk.read.requests_server_cmaui_test_nested3_test_nested2: + - test_nested2 + - disk.read.requests_server_cmaui_test_nested3 scalable_server_cmaui_test_nested3_test_nested2: - test_nested2 - scalable_server_cmaui_test_nested3 + network.incoming.packets_cmaui_port_11_test_nested2: + - test_nested2 + - network.incoming.packets_cmaui_port_11 + network.incoming.bytes_cmaui_port_11_test_nested2: + - test_nested2 + - network.incoming.bytes_cmaui_port_11 + vcpus_server_cmaui_test_nested3_test_nested2: + - test_nested2 + - vcpus_server_cmaui_test_nested3 host_server_cmaui_test_nested3_test_nested2: - test_nested2 - host_server_cmaui_test_nested3 - scalable_server_cmaui: + disk.device.read.requests.rate_server_cmaui_test_nested2: + - test_nested2 + - disk.device.read.requests.rate_server_cmaui + network.incoming.packets.rate_cmaui_port_1: + - cmaui_port_1 + - network.incoming.packets.rate + network.incoming.packets.rate_cmaui_port_2: + - cmaui_port_2 + - network.incoming.packets.rate + cpu_server_cmaui: - server_cmaui - - scalable - attachment_cmaui_port_22_test_nested3_test_nested2: + - cpu + feature_cmaui_port_1: + - cmaui_port_1 + - feature + feature_cmaui_port_2: + - cmaui_port_2 + - feature + disk.write.bytes.rate_server_cmaui: + - server_cmaui + - disk.write.bytes.rate + network.outgoing.packets.rate_cmaui_port_22_test_nested3_test_nested2: - test_nested2 - - attachment_cmaui_port_22_test_nested3 - host_server_cmaui: + - network.outgoing.packets.rate_cmaui_port_22_test_nested3 + disk.device.read.bytes.rate_server_cmaui: - server_cmaui - - host + - disk.device.read.bytes.rate + network.outgoing.packets.rate_cmaui_port_11_test_nested3_test_nested2: + - test_nested2 + - network.outgoing.packets.rate_cmaui_port_11_test_nested3 + disk.device.write.bytes_server_cmaui_test_nested2: + - test_nested2 + - disk.device.write.bytes_server_cmaui + network.incoming.bytes.rate_cmaui_port_11_test_nested2: + - test_nested2 + - network.incoming.bytes.rate_cmaui_port_11 + attachment_cmaui_port_2: + - cmaui_port_2 + - attachment + scalable_server_cmaui_test_nested2: + - test_nested2 + - scalable_server_cmaui + feature_test_nested2: + - test_nested2 + - feature + disk.device.latency_server_cmaui: + - server_cmaui + - disk.device.latency + disk.read.requests_server_cmaui: + - server_cmaui + - disk.read.requests + attachment_cmaui_port_22_test_nested2: + - test_nested2 + - attachment_cmaui_port_22 + disk.device.capacity_server_cmaui: + - server_cmaui + - disk.device.capacity + network.outgoing.packets.rate_cmaui_port_1: + - cmaui_port_1 + - network.outgoing.packets.rate + network.outgoing.packets.rate_cmaui_port_2: + - cmaui_port_2 + - network.outgoing.packets.rate + disk.device.allocation_server_cmaui_test_nested2: + - test_nested2 + - disk.device.allocation_server_cmaui + disk.read.bytes_server_cmaui_test_nested2: + - test_nested2 + - disk.read.bytes_server_cmaui + disk.usage_server_cmaui: + - server_cmaui + - disk.usage + disk.device.usage_server_cmaui: + - server_cmaui + - disk.device.usage + attachment_cmaui_port_1: + - cmaui_port_1 + - attachment + memory_server_cmaui_test_nested2: + - test_nested2 + - memory_server_cmaui + disk.capacity_server_cmaui: + - server_cmaui + - disk.capacity + disk.write.requests.rate_server_cmaui: + - server_cmaui + - disk.write.requests.rate + network.incoming.packets_cmaui_port_11_test_nested3_test_nested2: + - test_nested2 + - network.incoming.packets_cmaui_port_11_test_nested3 + disk.device.read.requests_server_cmaui_test_nested2: + - test_nested2 + - disk.device.read.requests_server_cmaui + network.incoming.bytes.rate_cmaui_port_22_test_nested3_test_nested2: + - test_nested2 + - network.incoming.bytes.rate_cmaui_port_22_test_nested3 + disk.device.read.bytes.rate_server_cmaui_test_nested2: + - test_nested2 + - disk.device.read.bytes.rate_server_cmaui + disk.device.read.requests_server_cmaui: + - server_cmaui + - disk.device.read.requests + disk.usage_server_cmaui_test_nested3_test_nested2: + - test_nested2 + - disk.usage_server_cmaui_test_nested3 + disk.device.latency_server_cmaui_test_nested2: + - test_nested2 + - disk.device.latency_server_cmaui + network.outgoing.bytes_cmaui_port_11_test_nested2: + - test_nested2 + - network.outgoing.bytes_cmaui_port_11 + disk.latency_server_cmaui_test_nested3_test_nested2: + - test_nested2 + - disk.latency_server_cmaui_test_nested3 + disk.device.write.bytes.rate_server_cmaui_test_nested2: + - test_nested2 + - disk.device.write.bytes.rate_server_cmaui + instance_server_cmaui_test_nested2: + - test_nested2 + - instance_server_cmaui + memory_server_cmaui: + - server_cmaui + - memory attachment_cmaui_port_11_test_nested3_test_nested2: - test_nested2 - attachment_cmaui_port_11_test_nested3 - endpoint_server_cmaui: - - server_cmaui - - endpoint - attachment_cmaui_port_11_test_nested2: + network.incoming.bytes_cmaui_port_22_test_nested3_test_nested2: - test_nested2 - - attachment_cmaui_port_11 + - network.incoming.bytes_cmaui_port_22_test_nested3 + disk.write.bytes.rate_server_cmaui_test_nested2: + - test_nested2 + - disk.write.bytes.rate_server_cmaui + disk.device.usage_server_cmaui_test_nested2: + - test_nested2 + - disk.device.usage_server_cmaui binding_server_cmaui: - server_cmaui - binding - attachment_cmaui_port_2: - - cmaui_port_2 - - attachment - endpoint_server_cmaui_test_nested2: + disk.iops_server_cmaui_test_nested2: - test_nested2 - - endpoint_server_cmaui + - disk.iops_server_cmaui + memory.usage_server_cmaui_test_nested3_test_nested2: + - test_nested2 + - memory.usage_server_cmaui_test_nested3 + disk.device.write.bytes_server_cmaui_test_nested3_test_nested2: + - test_nested2 + - disk.device.write.bytes_server_cmaui_test_nested3 + disk.device.read.requests.rate_server_cmaui: + - server_cmaui + - disk.device.read.requests.rate + network.incoming.packets.rate_cmaui_port_11_test_nested3_test_nested2: + - test_nested2 + - network.incoming.packets.rate_cmaui_port_11_test_nested3 + feature_server_cmaui_test_nested2: + - test_nested2 + - feature_server_cmaui + disk.write.bytes_server_cmaui_test_nested3_test_nested2: + - test_nested2 + - disk.write.bytes_server_cmaui_test_nested3 + disk.device.read.requests.rate_server_cmaui_test_nested3_test_nested2: + - test_nested2 + - disk.device.read.requests.rate_server_cmaui_test_nested3 + disk.write.bytes_server_cmaui: + - server_cmaui + - disk.write.bytes + disk.device.iops_server_cmaui_test_nested2: + - test_nested2 + - disk.device.iops_server_cmaui + disk.device.write.requests.rate_server_cmaui_test_nested2: + - test_nested2 + - disk.device.write.requests.rate_server_cmaui + network.outgoing.packets.rate_cmaui_port_11_test_nested2: + - test_nested2 + - network.outgoing.packets.rate_cmaui_port_11 + feature_server_cmaui_test_nested3_test_nested2: + - test_nested2 + - feature_server_cmaui_test_nested3 + disk.device.capacity_server_cmaui_test_nested3_test_nested2: + - test_nested2 + - disk.device.capacity_server_cmaui_test_nested3 + attachment_cmaui_port_22_test_nested3_test_nested2: + - test_nested2 + - attachment_cmaui_port_22_test_nested3 + disk.device.write.requests_server_cmaui_test_nested2: + - test_nested2 + - disk.device.write.requests_server_cmaui + network.outgoing.bytes_cmaui_port_22_test_nested2: + - test_nested2 + - network.outgoing.bytes_cmaui_port_22 + cpu.delta_server_cmaui_test_nested3_test_nested2: + - test_nested2 + - cpu.delta_server_cmaui_test_nested3 endpoint_server_cmaui_test_nested3_test_nested2: - test_nested2 - endpoint_server_cmaui_test_nested3 - scalable_server_cmaui_test_nested2: + memory.resident_server_cmaui: + - server_cmaui + - memory.resident + disk.device.write.bytes.rate_server_cmaui_test_nested3_test_nested2: - test_nested2 - - scalable_server_cmaui - host_server_cmaui_test_nested2: + - disk.device.write.bytes.rate_server_cmaui_test_nested3 + disk.device.usage_server_cmaui_test_nested3_test_nested2: - test_nested2 - - host_server_cmaui - binding_server_cmaui_test_nested2: + - disk.device.usage_server_cmaui_test_nested3 + disk.latency_server_cmaui: + - server_cmaui + - disk.latency + vcpus_server_cmaui: + - server_cmaui + - vcpus + network.outgoing.bytes.rate_cmaui_port_22_test_nested2: - test_nested2 - - binding_server_cmaui - os_server_cmaui_test_nested2: + - network.outgoing.bytes.rate_cmaui_port_22 + disk.device.write.bytes_server_cmaui: + - server_cmaui + - disk.device.write.bytes + network.incoming.bytes.rate_cmaui_port_1: + - cmaui_port_1 + - network.incoming.bytes.rate + network.incoming.bytes.rate_cmaui_port_2: + - cmaui_port_2 + - network.incoming.bytes.rate + disk.read.bytes.rate_server_cmaui_test_nested3_test_nested2: - test_nested2 - - os_server_cmaui - attachment_cmaui_port_22_test_nested2: + - disk.read.bytes.rate_server_cmaui_test_nested3 + disk.device.read.bytes.rate_server_cmaui_test_nested3_test_nested2: - test_nested2 - - attachment_cmaui_port_22 - os_server_cmaui_test_nested3_test_nested2: + - disk.device.read.bytes.rate_server_cmaui_test_nested3 + disk.root.size_server_cmaui_test_nested2: - test_nested2 - - os_server_cmaui_test_nested3 - attachment_cmaui_port_1: + - disk.root.size_server_cmaui + memory.resident_server_cmaui_test_nested3_test_nested2: + - test_nested2 + - memory.resident_server_cmaui_test_nested3 + disk.allocation_server_cmaui: + - server_cmaui + - disk.allocation + disk.write.requests_server_cmaui: + - server_cmaui + - disk.write.requests + network.outpoing.packets_cmaui_port_1: - cmaui_port_1 - - attachment + - network.outpoing.packets + network.outpoing.packets_cmaui_port_2: + - cmaui_port_2 + - network.outpoing.packets + network.incoming.packets_cmaui_port_22_test_nested2: + - test_nested2 + - network.incoming.packets_cmaui_port_22 + network.incoming.bytes_cmaui_port_22_test_nested2: + - test_nested2 + - network.incoming.bytes_cmaui_port_22 + cpu.delta_server_cmaui_test_nested2: + - test_nested2 + - cpu.delta_server_cmaui + network.incoming.bytes_cmaui_port_11_test_nested3_test_nested2: + - test_nested2 + - network.incoming.bytes_cmaui_port_11_test_nested3 + network.outpoing.packets_cmaui_port_22_test_nested2: + - test_nested2 + - network.outpoing.packets_cmaui_port_22 + disk.device.write.requests_server_cmaui_test_nested3_test_nested2: + - test_nested2 + - disk.device.write.requests_server_cmaui_test_nested3 + endpoint_server_cmaui: + - server_cmaui + - endpoint + feature_cmaui_port_11_test_nested2: + - test_nested2 + - feature_cmaui_port_11 + attachment_cmaui_port_11_test_nested2: + - test_nested2 + - attachment_cmaui_port_11 + network.outgoing.bytes.rate_cmaui_port_11_test_nested3_test_nested2: + - test_nested2 + - network.outgoing.bytes.rate_cmaui_port_11_test_nested3 + disk.device.capacity_server_cmaui_test_nested2: + - test_nested2 + - disk.device.capacity_server_cmaui requirements: + dependency_cmaui_port_22_test_nested2: + - test_nested2 + - dependency_cmaui_port_22 + dependency_server_cmaui: + - server_cmaui + - dependency + dependency_server_cmaui_test_nested2: + - test_nested2 + - dependency_server_cmaui + link_cmaui_port_22_test_nested2: + - test_nested2 + - link_cmaui_port_22 + dependency_cmaui_port_22_test_nested3_test_nested2: + - test_nested2 + - dependency_cmaui_port_22_test_nested3 + dependency_cmaui_port_11_test_nested2: + - test_nested2 + - dependency_cmaui_port_11 + link_cmaui_port_2: + - cmaui_port_2 + - link + link_cmaui_port_1: + - cmaui_port_1 + - link + dependency_cmaui_port_11_test_nested3_test_nested2: + - test_nested2 + - dependency_cmaui_port_11_test_nested3 local_storage_server_cmaui_test_nested2: - test_nested2 - local_storage_server_cmaui + dependency_server_cmaui_test_nested3_test_nested2: + - test_nested2 + - dependency_server_cmaui_test_nested3 local_storage_server_cmaui: - server_cmaui - local_storage link_cmaui_port_11_test_nested3_test_nested2: - test_nested2 - link_cmaui_port_11_test_nested3 - link_cmaui_port_22_test_nested2: + dependency_test_nested2: - test_nested2 - - link_cmaui_port_22 + - dependency link_cmaui_port_22_test_nested3_test_nested2: - test_nested2 - link_cmaui_port_22_test_nested3 + dependency_cmaui_port_1: + - cmaui_port_1 + - dependency local_storage_server_cmaui_test_nested3_test_nested2: - test_nested2 - local_storage_server_cmaui_test_nested3 - link_cmaui_port_2: - - cmaui_port_2 - - link + dependency_test_nested3_test_nested2: + - test_nested2 + - dependency_test_nested3 link_cmaui_port_11_test_nested2: - test_nested2 - link_cmaui_port_11 - link_cmaui_port_1: - - cmaui_port_1 - - link
\ No newline at end of file + dependency_cmaui_port_2: + - cmaui_port_2 + - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumelocal/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumelocal/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index ef081a9bec..48c3d92d3f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumelocal/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumelocal/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -2,32 +2,8 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: GlobalSubstitutionTypes imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml +- openecomp_heat_index: + file: openecomp-heat/_index.yml node_types: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute @@ -35,13 +11,26 @@ node_types: nova_image_name: type: string description: PCRF CM server name + required: true + status: SUPPORTED pcm_server_name: type: string description: PCRF CM server name + required: true + status: SUPPORTED nove_001_vol_property: type: string description: PCRF CM server name + required: true + status: SUPPORTED requirements: + - dependency_nova_001: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - local_storage_nova_001: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage @@ -50,8 +39,9 @@ node_types: - 0 - UNBOUNDED capabilities: - scalable_nova_001: - type: tosca.capabilities.Scalable + disk.iops_nova_001: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -67,8 +57,21 @@ node_types: occurrences: - 1 - UNBOUNDED - os_nova_001: - type: tosca.capabilities.OperatingSystem + disk.device.read.requests_nova_001: + type: org.openecomp.capabilities.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_nova_001: + type: org.openecomp.capabilities.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_nova_001: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -76,4 +79,205 @@ node_types: type: tosca.capabilities.network.Bindable occurrences: - 1 + - UNBOUNDED + disk.device.iops_nova_001: + type: org.openecomp.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_nova_001: + type: org.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_nova_001: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes.rate_nova_001: + type: org.openecomp.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_nova_001: + type: org.openecomp.capabilities.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_nova_001: + type: org.openecomp.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_nova_001: + type: org.openecomp.capabilities.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_nova_001: + type: org.openecomp.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_nova_001: + type: org.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_nova_001: + type: org.openecomp.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_nova_001: + type: org.openecomp.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_nova_001: + type: org.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_nova_001: + type: org.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_nova_001: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + disk.device.latency_nova_001: + type: org.openecomp.capabilities.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_nova_001: + type: org.openecomp.capabilities.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_nova_001: + type: org.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_nova_001: + type: org.openecomp.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_nova_001: + type: org.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_nova_001: + type: org.openecomp.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_nova_001: + type: org.openecomp.capabilities.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_nova_001: + type: org.openecomp.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_nova_001: + type: org.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_nova_001: + type: org.openecomp.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_nova_001: + type: org.openecomp.capabilities.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_nova_001: + type: org.openecomp.capabilities.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_nova_001: + type: org.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_nova_001: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + memory_nova_001: + type: org.openecomp.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_nova_001: + type: org.openecomp.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_nova_001: + type: org.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_nova_001: + type: org.openecomp.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_nova_001: + type: org.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_nova_001: + type: org.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/heat/nested/nestedvolumelocal/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumelocal/expectedoutputfiles/MainServiceTemplate.yaml index 136eb6309a..2fbec0c498 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumelocal/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumelocal/expectedoutputfiles/MainServiceTemplate.yaml @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: Main imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml topology_template: inputs: not_null: @@ -55,7 +31,7 @@ topology_template: properties: { } groups: - hot-nimbus-pcm_v0.4: + hot-nimbus-pcm_v0.4_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/hot-nimbus-pcm_v0.4.yaml diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumelocal/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumelocal/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml index 1b9c34f1da..f11aa503a3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumelocal/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumelocal/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: nested-pcm_v0.1 imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml node_types: org.openecomp.resource.vfc.nodes.heat.nova: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server @@ -60,7 +36,7 @@ topology_template: image: get_input: nova_image_name groups: - nested-pcm_v0.1: + nested-pcm_v0.1_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/nested-pcm_v0.1.yaml @@ -70,22 +46,133 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1 capabilities: - scalable_nova_001: + disk.iops_nova_001: - nova_001 - - scalable + - disk.iops host_nova_001: - nova_001 - host endpoint_nova_001: - nova_001 - endpoint - os_nova_001: + disk.device.read.requests_nova_001: - nova_001 - - os + - disk.device.read.requests + disk.device.write.requests_nova_001: + - nova_001 + - disk.device.write.requests + disk.device.write.requests.rate_nova_001: + - nova_001 + - disk.device.write.requests.rate binding_nova_001: - nova_001 - binding + disk.device.iops_nova_001: + - nova_001 + - disk.device.iops + disk.read.bytes_nova_001: + - nova_001 + - disk.read.bytes + os_nova_001: + - nova_001 + - os + disk.device.read.bytes.rate_nova_001: + - nova_001 + - disk.device.read.bytes.rate + disk.usage_nova_001: + - nova_001 + - disk.usage + disk.device.allocation_nova_001: + - nova_001 + - disk.device.allocation + disk.root.size_nova_001: + - nova_001 + - disk.root.size + disk.device.read.requests.rate_nova_001: + - nova_001 + - disk.device.read.requests.rate + disk.write.bytes_nova_001: + - nova_001 + - disk.write.bytes + memory.usage_nova_001: + - nova_001 + - memory.usage + disk.capacity_nova_001: + - nova_001 + - disk.capacity + disk.write.requests_nova_001: + - nova_001 + - disk.write.requests + vcpus_nova_001: + - nova_001 + - vcpus + scalable_nova_001: + - nova_001 + - scalable + disk.device.latency_nova_001: + - nova_001 + - disk.device.latency + disk.device.write.bytes.rate_nova_001: + - nova_001 + - disk.device.write.bytes.rate + disk.device.usage_nova_001: + - nova_001 + - disk.device.usage + cpu.delta_nova_001: + - nova_001 + - cpu.delta + disk.latency_nova_001: + - nova_001 + - disk.latency + instance_nova_001: + - nova_001 + - instance + disk.read.bytes.rate_nova_001: + - nova_001 + - disk.read.bytes.rate + disk.device.read.bytes_nova_001: + - nova_001 + - disk.device.read.bytes + disk.allocation_nova_001: + - nova_001 + - disk.allocation + memory.resident_nova_001: + - nova_001 + - memory.resident + disk.write.bytes.rate_nova_001: + - nova_001 + - disk.write.bytes.rate + disk.device.write.bytes_nova_001: + - nova_001 + - disk.device.write.bytes + disk.device.capacity_nova_001: + - nova_001 + - disk.device.capacity + feature_nova_001: + - nova_001 + - feature + memory_nova_001: + - nova_001 + - memory + disk.write.requests.rate_nova_001: + - nova_001 + - disk.write.requests.rate + disk.ephemeral.size_nova_001: + - nova_001 + - disk.ephemeral.size + cpu_util_nova_001: + - nova_001 + - cpu_util + disk.read.requests_nova_001: + - nova_001 + - disk.read.requests + cpu_nova_001: + - nova_001 + - cpu requirements: local_storage_nova_001: - nova_001 - - local_storage
\ No newline at end of file + - local_storage + dependency_nova_001: + - nova_001 + - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumelocal/inputs/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumelocal/inputs/MANIFEST.json index 44c5652ed6..6f37dcd40e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumelocal/inputs/MANIFEST.json +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumelocal/inputs/MANIFEST.json @@ -6,7 +6,8 @@ { "file": "hot-nimbus-pcm_v0.4.yaml", "type": "HEAT" - },{ + }, + { "file": "nested-pcm_v0.1.yaml", "type": "HEAT" } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumeseperatefile/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumeseperatefile/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 5edf602a57..0dbf560f84 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumeseperatefile/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumeseperatefile/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -2,32 +2,8 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: GlobalSubstitutionTypes imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml +- openecomp_heat_index: + file: openecomp-heat/_index.yml node_types: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute @@ -35,13 +11,26 @@ node_types: nova_image_name: type: string description: nova image name + required: true + status: SUPPORTED pcm_server_name: type: string description: PCRF CM server name + required: true + status: SUPPORTED nove_001_vol_property: type: string description: volume name + required: true + status: SUPPORTED requirements: + - dependency_nova_001: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - local_storage_nova_001: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage @@ -50,8 +39,9 @@ node_types: - 0 - UNBOUNDED capabilities: - scalable_nova_001: - type: tosca.capabilities.Scalable + disk.iops_nova_001: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -67,8 +57,21 @@ node_types: occurrences: - 1 - UNBOUNDED - os_nova_001: - type: tosca.capabilities.OperatingSystem + disk.device.read.requests_nova_001: + type: org.openecomp.capabilities.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_nova_001: + type: org.openecomp.capabilities.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_nova_001: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -76,4 +79,205 @@ node_types: type: tosca.capabilities.network.Bindable occurrences: - 1 + - UNBOUNDED + disk.device.iops_nova_001: + type: org.openecomp.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_nova_001: + type: org.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_nova_001: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes.rate_nova_001: + type: org.openecomp.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_nova_001: + type: org.openecomp.capabilities.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_nova_001: + type: org.openecomp.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_nova_001: + type: org.openecomp.capabilities.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_nova_001: + type: org.openecomp.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_nova_001: + type: org.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_nova_001: + type: org.openecomp.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_nova_001: + type: org.openecomp.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_nova_001: + type: org.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_nova_001: + type: org.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_nova_001: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + disk.device.latency_nova_001: + type: org.openecomp.capabilities.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_nova_001: + type: org.openecomp.capabilities.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_nova_001: + type: org.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_nova_001: + type: org.openecomp.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_nova_001: + type: org.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_nova_001: + type: org.openecomp.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_nova_001: + type: org.openecomp.capabilities.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_nova_001: + type: org.openecomp.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_nova_001: + type: org.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_nova_001: + type: org.openecomp.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_nova_001: + type: org.openecomp.capabilities.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_nova_001: + type: org.openecomp.capabilities.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_nova_001: + type: org.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_nova_001: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + memory_nova_001: + type: org.openecomp.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_nova_001: + type: org.openecomp.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_nova_001: + type: org.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_nova_001: + type: org.openecomp.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_nova_001: + type: org.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_nova_001: + type: org.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/heat/nested/nestedvolumeseperatefile/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumeseperatefile/expectedoutputfiles/MainServiceTemplate.yaml index 30e792209b..b6d5633203 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumeseperatefile/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumeseperatefile/expectedoutputfiles/MainServiceTemplate.yaml @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: Main imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml topology_template: inputs: not_null: @@ -57,16 +33,16 @@ topology_template: properties: { } groups: - volume: + hot-nimbus-pcm_v0.4_group: type: org.openecomp.groups.heat.HeatStack properties: - heat_file: ../Artifacts/volume.yaml + heat_file: ../Artifacts/hot-nimbus-pcm_v0.4.yaml + description: heat template that creates PCRF Cluman stack members: - - nove_001_vol - hot-nimbus-pcm_v0.4: + - server_pcm_001 + volume_group: type: org.openecomp.groups.heat.HeatStack properties: - heat_file: ../Artifacts/hot-nimbus-pcm_v0.4.yaml - description: heat template that creates PCRF Cluman stack + heat_file: ../Artifacts/volume.yaml members: - - server_pcm_001
\ No newline at end of file + - nove_001_vol
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumeseperatefile/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumeseperatefile/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml index 3f03905588..9dee4bf2ce 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumeseperatefile/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumeseperatefile/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: nested-pcm_v0.1 imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml node_types: org.openecomp.resource.vfc.nodes.heat.nova: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server @@ -60,7 +36,7 @@ topology_template: image: get_input: nova_image_name groups: - nested-pcm_v0.1: + nested-pcm_v0.1_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/nested-pcm_v0.1.yaml @@ -70,22 +46,133 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1 capabilities: - scalable_nova_001: + disk.iops_nova_001: - nova_001 - - scalable + - disk.iops host_nova_001: - nova_001 - host endpoint_nova_001: - nova_001 - endpoint - os_nova_001: + disk.device.read.requests_nova_001: - nova_001 - - os + - disk.device.read.requests + disk.device.write.requests_nova_001: + - nova_001 + - disk.device.write.requests + disk.device.write.requests.rate_nova_001: + - nova_001 + - disk.device.write.requests.rate binding_nova_001: - nova_001 - binding + disk.device.iops_nova_001: + - nova_001 + - disk.device.iops + disk.read.bytes_nova_001: + - nova_001 + - disk.read.bytes + os_nova_001: + - nova_001 + - os + disk.device.read.bytes.rate_nova_001: + - nova_001 + - disk.device.read.bytes.rate + disk.usage_nova_001: + - nova_001 + - disk.usage + disk.device.allocation_nova_001: + - nova_001 + - disk.device.allocation + disk.root.size_nova_001: + - nova_001 + - disk.root.size + disk.device.read.requests.rate_nova_001: + - nova_001 + - disk.device.read.requests.rate + disk.write.bytes_nova_001: + - nova_001 + - disk.write.bytes + memory.usage_nova_001: + - nova_001 + - memory.usage + disk.capacity_nova_001: + - nova_001 + - disk.capacity + disk.write.requests_nova_001: + - nova_001 + - disk.write.requests + vcpus_nova_001: + - nova_001 + - vcpus + scalable_nova_001: + - nova_001 + - scalable + disk.device.latency_nova_001: + - nova_001 + - disk.device.latency + disk.device.write.bytes.rate_nova_001: + - nova_001 + - disk.device.write.bytes.rate + disk.device.usage_nova_001: + - nova_001 + - disk.device.usage + cpu.delta_nova_001: + - nova_001 + - cpu.delta + disk.latency_nova_001: + - nova_001 + - disk.latency + instance_nova_001: + - nova_001 + - instance + disk.read.bytes.rate_nova_001: + - nova_001 + - disk.read.bytes.rate + disk.device.read.bytes_nova_001: + - nova_001 + - disk.device.read.bytes + disk.allocation_nova_001: + - nova_001 + - disk.allocation + memory.resident_nova_001: + - nova_001 + - memory.resident + disk.write.bytes.rate_nova_001: + - nova_001 + - disk.write.bytes.rate + disk.device.write.bytes_nova_001: + - nova_001 + - disk.device.write.bytes + disk.device.capacity_nova_001: + - nova_001 + - disk.device.capacity + feature_nova_001: + - nova_001 + - feature + memory_nova_001: + - nova_001 + - memory + disk.write.requests.rate_nova_001: + - nova_001 + - disk.write.requests.rate + disk.ephemeral.size_nova_001: + - nova_001 + - disk.ephemeral.size + cpu_util_nova_001: + - nova_001 + - cpu_util + disk.read.requests_nova_001: + - nova_001 + - disk.read.requests + cpu_nova_001: + - nova_001 + - cpu requirements: local_storage_nova_001: - nova_001 - - local_storage
\ No newline at end of file + - local_storage + dependency_nova_001: + - nova_001 + - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumeseperatefile/inputs/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumeseperatefile/inputs/MANIFEST.json index 63b14401c8..724ddc7017 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumeseperatefile/inputs/MANIFEST.json +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumeseperatefile/inputs/MANIFEST.json @@ -6,10 +6,12 @@ { "file": "hot-nimbus-pcm_v0.4.yaml", "type": "HEAT" - },{ + }, + { "file": "nested-pcm_v0.1.yaml", "type": "HEAT" - },{ + }, + { "file": "volume.yaml", "type": "HEAT_VOL" } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 2dee4a9971..029052218e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -2,32 +2,8 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: GlobalSubstitutionTypes imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml +- openecomp_heat_index: + file: openecomp-heat/_index.yml node_types: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1_2: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute @@ -35,47 +11,83 @@ node_types: pcm_flavor_name: type: string description: flavor name of PCRF CM instance + required: true + status: SUPPORTED availabilityzone_name: type: string description: availabilityzone name + required: true + status: SUPPORTED pcm_image_name: type: string description: PCRF CM image name + required: true + status: SUPPORTED pcm_vol: type: string description: CPS Cluman Cinder Volume + required: true + status: SUPPORTED security_group_name: type: string description: the name of security group + required: true + status: SUPPORTED cps_net_ip: type: string description: CPS network ip + required: true + status: SUPPORTED pcm_server_name: type: string description: PCRF CM server name + required: true + status: SUPPORTED cps_net_name: type: string description: CPS network name + required: true + status: SUPPORTED cps_net_mask: type: string description: CPS network mask + required: true + status: SUPPORTED oam_net_ip: type: string + required: true + status: SUPPORTED oam_net_name: type: string description: OAM network name + required: true + status: SUPPORTED 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 - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_server_pcm: + 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 @@ -83,16 +95,164 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_pcm_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_pcm_port_0: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_network: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED capabilities: - endpoint_server_pcm: - type: tosca.capabilities.Endpoint.Admin + 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: + - 1 + - UNBOUNDED + cpu_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_pcm_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_pcm_port_1: + type: org.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: + type: org.openecomp.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: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.resident_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.usage_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.allocation_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.usage_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.root.size_server_pcm: + type: org.openecomp.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: + type: org.openecomp.capabilities.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: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_pcm_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.requests_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -101,11 +261,158 @@ node_types: occurrences: - 1 - UNBOUNDED + disk.capacity_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED os_server_pcm: type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED + disk.read.bytes_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + 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 + 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 + feature_pcm_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_pcm_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_pcm_port_0: + type: tosca.capabilities.Node + occurrences: + - 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. + occurrences: + - 1 + - UNBOUNDED + attachment_pcm_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + attachment_pcm_port_1: + 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: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + end_point_network: + type: tosca.capabilities.Endpoint + occurrences: + - 1 + - UNBOUNDED + vcpus_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + attachment_network: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes.rate_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.allocation_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + scalable_server_pcm: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + feature_network: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes.rate_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_util_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + 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 + 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 host_server_pcm: type: tosca.capabilities.Container valid_source_types: @@ -113,13 +420,21 @@ node_types: occurrences: - 1 - UNBOUNDED - scalable_server_pcm: - type: tosca.capabilities.Scalable + 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 - attachment_network: - type: tosca.capabilities.Attachment + network.outgoing.bytes.rate_pcm_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pcm_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -128,13 +443,68 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pcm_port_0: - type: tosca.capabilities.Attachment + network.outgoing.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. occurrences: - 1 - UNBOUNDED - attachment_pcm_port_1: - type: tosca.capabilities.Attachment + 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: + - 1 + - UNBOUNDED + network.incoming.packets_pcm_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + 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. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests.rate_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.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 + disk.device.read.requests_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_server_pcm: + type: tosca.capabilities.Node + 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. + occurrences: + - 1 + - UNBOUNDED + 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: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pcm_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -144,60 +514,104 @@ node_types: availabilityzone_name: type: string description: availabilityzone name + required: true + status: SUPPORTED oam_net_gw: type: string description: CPS network gateway + required: true + status: SUPPORTED pcm_image_name: type: string description: PCRF CM image name + required: true + status: SUPPORTED cps_net_ips: type: string description: CPS network ip + required: true + status: SUPPORTED security_group_name: type: string description: the name of security group + required: true + status: SUPPORTED cps_net_ip: type: string description: CPS network ip + required: true + status: SUPPORTED pcm_volumes: type: string description: CPS Cluman Cinder Volume + required: true + status: SUPPORTED pcm_flavor_name: type: string description: flavor name of PCRF CM instance + required: true + status: SUPPORTED pcm_vol: type: string description: CPS Cluman Cinder Volume + required: true + status: SUPPORTED pcm_server_name: type: string description: PCRF CM server name + required: true + status: SUPPORTED cps_net_name: type: string description: CPS network name + required: true + status: SUPPORTED cps_net_mask: type: string description: CPS network mask + required: true + status: SUPPORTED oam_net_ip: type: string description: OAM network ip + required: true + status: SUPPORTED oam_net_mask: type: string description: CPS network mask + required: true + status: SUPPORTED oam_net_name: type: string description: OAM network name + required: true + status: SUPPORTED 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 - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_server_pcm: + 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 @@ -205,13 +619,33 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_server_pcm_005: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - dependency_pcm_port_1_server_pcm_005: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_pcm_port_1_server_pcm_005: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_server_pcm_server_pcm_005: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - local_storage_server_pcm_server_pcm_005: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage @@ -219,23 +653,429 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_pcm_port_0_server_pcm_005: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_pcm_port_0_server_pcm_005: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_network_server_pcm_005: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - dependency_pcm_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_pcm_port_0: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_network: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED capabilities: - endpoint_server_pcm: - type: tosca.capabilities.Endpoint.Admin + 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: + - 1 + - UNBOUNDED + scalable_server_pcm_server_pcm_005: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_pcm_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_pcm_port_1: + type: org.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: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_pcm_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pcm_port_1_server_pcm_005: + type: org.openecomp.capabilities.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: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_pcm_port_1_server_pcm_005: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + link_network_server_pcm_005: + type: tosca.capabilities.network.Linkable + occurrences: + - 1 + - UNBOUNDED + memory_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_pcm_port_1_server_pcm_005: + type: org.openecomp.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. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests.rate_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_pcm_port_1_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + os_server_pcm_server_pcm_005: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + feature_pcm_port_0_server_pcm_005: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.usage_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes.rate_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + 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 + network.incoming.packets_pcm_port_0_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.requests_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_pcm_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + instance_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_pcm_port_0: + 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: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_pcm_port_1_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.requests_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.iops_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes.rate_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_pcm_port_0_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_pcm_port_1_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.latency_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + 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 + 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 + feature_pcm_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_pcm_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_pcm_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_pcm_port_1_server_pcm_005: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + 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. + occurrences: + - 1 + - UNBOUNDED + attachment_pcm_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + attachment_pcm_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + attachment_pcm_port_1_server_pcm_005: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.device.usage_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests.rate_server_pcm: + type: org.openecomp.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_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + 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 + attachment_network: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes.rate_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes.rate_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + attachment_pcm_port_0_server_pcm_005: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.device.allocation_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.allocation_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + scalable_server_pcm: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + feature_network: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + cpu_util_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + vcpus_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -246,6 +1086,129 @@ node_types: occurrences: - 1 - UNBOUNDED + 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 + binding_server_pcm: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + 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: + - 1 + - UNBOUNDED + disk.device.write.requests.rate_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.usage_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.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 + disk.device.read.requests_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_pcm_port_1_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_util_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_server_pcm: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.ephemeral.size_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + 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: + - 1 + - UNBOUNDED + memory.resident_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_pcm_port_0_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.capacity_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_network_server_pcm_005: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_pcm_port_0_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.latency_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.requests.rate_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED host_server_pcm_server_pcm_005: type: tosca.capabilities.Container valid_source_types: @@ -253,13 +1216,15 @@ node_types: occurrences: - 1 - UNBOUNDED - os_server_pcm_server_pcm_005: - type: tosca.capabilities.OperatingSystem + network.outpoing.packets_pcm_port_0_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - scalable_server_pcm_server_pcm_005: - type: tosca.capabilities.Scalable + disk.read.bytes.rate_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -273,18 +1238,62 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_network_server_pcm_005: - type: tosca.capabilities.Attachment + 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 - attachment_network: - type: tosca.capabilities.Attachment + cpu_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_server_pcm: - type: tosca.capabilities.network.Bindable + memory.resident_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.usage_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_server_pcm_005: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_pcm_port_0_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. occurrences: - 1 - UNBOUNDED @@ -293,8 +1302,9 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pcm_port_0_server_pcm_005: - type: tosca.capabilities.Attachment + disk.capacity_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -303,28 +1313,173 @@ node_types: occurrences: - 1 - UNBOUNDED - link_network_server_pcm_005: - type: tosca.capabilities.network.Linkable + memory.usage_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - scalable_server_pcm: - type: tosca.capabilities.Scalable + network.incoming.packets.rate_pcm_port_0_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_pcm_port_0: - type: tosca.capabilities.Attachment + endpoint_server_pcm: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - attachment_pcm_port_1: - type: tosca.capabilities.Attachment + end_point_network: + type: tosca.capabilities.Endpoint occurrences: - 1 - UNBOUNDED - attachment_pcm_port_1_server_pcm_005: + disk.device.write.requests_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.iops_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_pcm_port_1_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pcm_port_0_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_server_pcm_server_pcm_005: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes.rate_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests.rate_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_pcm_port_0_server_pcm_005: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + 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 + 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 + disk.device.allocation_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pcm_port_1_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + attachment_network_server_pcm_005: type: tosca.capabilities.Attachment occurrences: - 1 + - UNBOUNDED + network.outgoing.bytes.rate_pcm_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.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. + occurrences: + - 1 + - UNBOUNDED + end_point_network_server_pcm_005: + type: tosca.capabilities.Endpoint + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pcm_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.root.size_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + 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. + occurrences: + - 1 + - UNBOUNDED + cpu.delta_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pcm_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 - UNBOUNDED
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/MainServiceTemplate.yaml index a0063b174e..d61871c767 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/MainServiceTemplate.yaml @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: Main imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml topology_template: inputs: oam_net_ips: @@ -222,19 +198,19 @@ topology_template: cps_net_mask: get_input: cps_net_mask groups: - hot-nimbus-pcm_v0.4_2: + hot-nimbus-pcm_v0.4_group: type: org.openecomp.groups.heat.HeatStack properties: - heat_file: ../Artifacts/hot-nimbus-pcm_v0.4_2.yaml + heat_file: ../Artifacts/hot-nimbus-pcm_v0.4.yaml description: heat template that creates PCRF Cluman stack members: - - server_pcm_004 - - server_pcm_003 - hot-nimbus-pcm_v0.4: + - server_pcm_002 + - server_pcm_001 + hot-nimbus-pcm_v0.4_2_group: type: org.openecomp.groups.heat.HeatStack properties: - heat_file: ../Artifacts/hot-nimbus-pcm_v0.4.yaml + heat_file: ../Artifacts/hot-nimbus-pcm_v0.4_2.yaml description: heat template that creates PCRF Cluman stack members: - - server_pcm_002 - - server_pcm_001
\ No newline at end of file + - server_pcm_004 + - server_pcm_003
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml index 39fb736465..480a645fdf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: nested-pcm_v0.1 imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml node_types: org.openecomp.resource.vfc.nodes.heat.pcm_server: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server @@ -129,11 +105,21 @@ topology_template: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: - ip_address: get_input: oam_net_ip + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -150,7 +136,7 @@ topology_template: get_input: availabilityzone_name image: get_input: pcm_image_name - config_drive: 'True' + config_drive: true user_data_format: RAW name: get_input: pcm_server_name @@ -180,11 +166,21 @@ topology_template: pcm_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: - ip_address: get_input: cps_net_ip + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: cps network: get_input: cps_net_name requirements: @@ -198,7 +194,7 @@ topology_template: network_name: get_input: cps_net_name groups: - nested-pcm_v0.1: + nested-pcm_v0.1_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/nested-pcm_v0.1.yaml @@ -216,76 +212,454 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1 capabilities: - endpoint_server_pcm: + network.incoming.packets.rate_pcm_port_0: + - pcm_port_0 + - network.incoming.packets.rate + scalable_server_pcm_server_pcm_005: + - server_pcm_005 + - scalable_server_pcm + 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 - - endpoint + - memory + network.outpoing.packets_pcm_port_0: + - pcm_port_0 + - network.outpoing.packets + disk.device.write.bytes_server_pcm_server_pcm_005: + - server_pcm_005 + - disk.device.write.bytes_server_pcm + network.incoming.bytes.rate_pcm_port_1_server_pcm_005: + - server_pcm_005 + - network.incoming.bytes.rate_pcm_port_1 + disk.device.iops_server_pcm: + - server_pcm + - disk.device.iops + binding_pcm_port_1_server_pcm_005: + - server_pcm_005 + - binding_pcm_port_1 + link_network_server_pcm_005: + - server_pcm_005 + - link_network + memory_server_pcm_server_pcm_005: + - server_pcm_005 + - memory_server_pcm + network.outgoing.packets.rate_pcm_port_1_server_pcm_005: + - server_pcm_005 + - network.outgoing.packets.rate_pcm_port_1 + disk.allocation_server_pcm: + - server_pcm + - disk.allocation + disk.device.read.requests.rate_server_pcm_server_pcm_005: + - server_pcm_005 + - disk.device.read.requests.rate_server_pcm + network.outgoing.bytes_pcm_port_1_server_pcm_005: + - server_pcm_005 + - network.outgoing.bytes_pcm_port_1 + os_server_pcm_server_pcm_005: + - server_pcm_005 + - os_server_pcm + feature_pcm_port_0_server_pcm_005: + - server_pcm_005 + - feature_pcm_port_0 + disk.usage_server_pcm: + - server_pcm + - disk.usage + disk.read.bytes_server_pcm_server_pcm_005: + - server_pcm_005 + - disk.read.bytes_server_pcm + disk.device.write.bytes.rate_server_pcm_server_pcm_005: + - server_pcm_005 + - disk.device.write.bytes.rate_server_pcm + disk.root.size_server_pcm: + - server_pcm + - disk.root.size + network.incoming.packets_pcm_port_0_server_pcm_005: + - server_pcm_005 + - network.incoming.packets_pcm_port_0 + disk.device.latency_server_pcm: + - server_pcm + - disk.device.latency + network.incoming.bytes_pcm_port_0: + - pcm_port_0 + - network.incoming.bytes + disk.write.requests_server_pcm_server_pcm_005: + - server_pcm_005 + - disk.write.requests_server_pcm + network.incoming.bytes_pcm_port_1: + - pcm_port_1 + - network.incoming.bytes + instance_server_pcm_server_pcm_005: + - server_pcm_005 + - instance_server_pcm + binding_pcm_port_0: + - pcm_port_0 + - binding + binding_pcm_port_1: + - pcm_port_1 + - binding + memory.usage_server_pcm: + - server_pcm + - memory.usage + network.incoming.packets.rate_pcm_port_1_server_pcm_005: + - server_pcm_005 + - network.incoming.packets.rate_pcm_port_1 + disk.read.requests_server_pcm: + - server_pcm + - disk.read.requests + disk.iops_server_pcm_server_pcm_005: + - server_pcm_005 + - disk.iops_server_pcm + disk.device.read.bytes.rate_server_pcm_server_pcm_005: + - server_pcm_005 + - disk.device.read.bytes.rate_server_pcm + disk.read.bytes_server_pcm: + - server_pcm + - disk.read.bytes + network.outgoing.bytes_pcm_port_0_server_pcm_005: + - server_pcm_005 + - network.outgoing.bytes_pcm_port_0 + network.outgoing.bytes.rate_pcm_port_1_server_pcm_005: + - server_pcm_005 + - network.outgoing.bytes.rate_pcm_port_1 + disk.device.latency_server_pcm_server_pcm_005: + - server_pcm_005 + - disk.device.latency_server_pcm + 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 + feature_pcm_port_1_server_pcm_005: + - server_pcm_005 + - feature_pcm_port_1 + disk.device.read.requests_server_pcm_server_pcm_005: + - server_pcm_005 + - disk.device.read.requests_server_pcm + 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 + attachment_pcm_port_1_server_pcm_005: + - server_pcm_005 + - attachment_pcm_port_1 + disk.device.usage_server_pcm_server_pcm_005: + - server_pcm_005 + - disk.device.usage_server_pcm + disk.device.read.requests.rate_server_pcm: + - server_pcm + - disk.device.read.requests.rate + disk.read.requests_server_pcm_server_pcm_005: + - server_pcm_005 + - disk.read.requests_server_pcm + vcpus_server_pcm: + - server_pcm + - vcpus + attachment_network: + - network + - attachment + disk.write.bytes_server_pcm: + - server_pcm + - disk.write.bytes + disk.write.bytes.rate_server_pcm_server_pcm_005: + - server_pcm_005 + - disk.write.bytes.rate_server_pcm + disk.read.bytes.rate_server_pcm: + - server_pcm + - disk.read.bytes.rate + attachment_pcm_port_0_server_pcm_005: + - server_pcm_005 + - attachment_pcm_port_0 + disk.device.allocation_server_pcm: + - server_pcm + - disk.device.allocation + disk.allocation_server_pcm_server_pcm_005: + - server_pcm_005 + - disk.allocation_server_pcm + scalable_server_pcm: + - server_pcm + - scalable + feature_network: + - network + - feature + cpu_util_server_pcm: + - server_pcm + - cpu_util + vcpus_server_pcm_server_pcm_005: + - server_pcm_005 + - vcpus_server_pcm host_server_pcm: - server_pcm - host + cpu.delta_server_pcm: + - server_pcm + - cpu.delta + binding_server_pcm: + - server_pcm + - binding + disk.write.bytes_server_pcm_server_pcm_005: + - server_pcm_005 + - disk.write.bytes_server_pcm + disk.device.capacity_server_pcm: + - server_pcm + - disk.device.capacity + disk.device.write.requests.rate_server_pcm: + - server_pcm + - disk.device.write.requests.rate + disk.usage_server_pcm_server_pcm_005: + - server_pcm_005 + - disk.usage_server_pcm + disk.latency_server_pcm: + - server_pcm + - disk.latency + disk.device.read.requests_server_pcm: + - server_pcm + - disk.device.read.requests + network.outpoing.packets_pcm_port_1_server_pcm_005: + - server_pcm_005 + - network.outpoing.packets_pcm_port_1 + cpu_util_server_pcm_server_pcm_005: + - server_pcm_005 + - cpu_util_server_pcm + feature_server_pcm: + - server_pcm + - feature + disk.ephemeral.size_server_pcm_server_pcm_005: + - server_pcm_005 + - disk.ephemeral.size_server_pcm + disk.write.bytes.rate_server_pcm: + - server_pcm + - disk.write.bytes.rate + memory.resident_server_pcm_server_pcm_005: + - server_pcm_005 + - memory.resident_server_pcm + network.incoming.bytes_pcm_port_0_server_pcm_005: + - server_pcm_005 + - network.incoming.bytes_pcm_port_0 + disk.capacity_server_pcm_server_pcm_005: + - server_pcm_005 + - disk.capacity_server_pcm + feature_network_server_pcm_005: + - server_pcm_005 + - feature_network + network.outgoing.bytes.rate_pcm_port_0_server_pcm_005: + - server_pcm_005 + - network.outgoing.bytes.rate_pcm_port_0 + disk.latency_server_pcm_server_pcm_005: + - server_pcm_005 + - disk.latency_server_pcm + cpu_server_pcm: + - server_pcm + - cpu + disk.write.requests.rate_server_pcm_server_pcm_005: + - server_pcm_005 + - disk.write.requests.rate_server_pcm host_server_pcm_server_pcm_005: - server_pcm_005 - host_server_pcm - os_server_pcm_server_pcm_005: + network.outpoing.packets_pcm_port_0_server_pcm_005: - server_pcm_005 - - os_server_pcm - scalable_server_pcm_server_pcm_005: + - network.outpoing.packets_pcm_port_0 + disk.read.bytes.rate_server_pcm_server_pcm_005: - server_pcm_005 - - scalable_server_pcm + - disk.read.bytes.rate_server_pcm binding_server_pcm_server_pcm_005: - server_pcm_005 - binding_server_pcm endpoint_server_pcm_server_pcm_005: - server_pcm_005 - endpoint_server_pcm - attachment_network_server_pcm_005: + disk.write.requests_server_pcm: + - server_pcm + - disk.write.requests + cpu_server_pcm_server_pcm_005: - server_pcm_005 - - attachment_network - attachment_network: - - network - - attachment - binding_server_pcm: + - cpu_server_pcm + memory.resident_server_pcm: - server_pcm - - binding + - memory.resident + disk.device.read.bytes_server_pcm_server_pcm_005: + - server_pcm_005 + - disk.device.read.bytes_server_pcm + disk.device.write.requests_server_pcm: + - server_pcm + - disk.device.write.requests + disk.device.usage_server_pcm: + - server_pcm + - disk.device.usage + feature_server_pcm_005: + - server_pcm_005 + - feature + disk.device.write.bytes_server_pcm: + - server_pcm + - disk.device.write.bytes + network.outgoing.packets.rate_pcm_port_0_server_pcm_005: + - server_pcm_005 + - network.outgoing.packets.rate_pcm_port_0 + disk.ephemeral.size_server_pcm: + - server_pcm + - disk.ephemeral.size link_network: - network - link - attachment_pcm_port_0_server_pcm_005: - - server_pcm_005 - - attachment_pcm_port_0 + disk.capacity_server_pcm: + - server_pcm + - disk.capacity os_server_pcm: - server_pcm - os - link_network_server_pcm_005: + memory.usage_server_pcm_server_pcm_005: - server_pcm_005 - - link_network - scalable_server_pcm: + - memory.usage_server_pcm + network.incoming.packets.rate_pcm_port_0_server_pcm_005: + - server_pcm_005 + - network.incoming.packets.rate_pcm_port_0 + endpoint_server_pcm: - server_pcm - - scalable - attachment_pcm_port_0: + - endpoint + end_point_network: + - network + - end_point + disk.device.write.requests_server_pcm_server_pcm_005: + - server_pcm_005 + - disk.device.write.requests_server_pcm + disk.device.iops_server_pcm_server_pcm_005: + - server_pcm_005 + - disk.device.iops_server_pcm + disk.iops_server_pcm: + - server_pcm + - disk.iops + disk.device.capacity_server_pcm_server_pcm_005: + - server_pcm_005 + - disk.device.capacity_server_pcm + network.incoming.bytes_pcm_port_1_server_pcm_005: + - server_pcm_005 + - network.incoming.bytes_pcm_port_1 + network.incoming.bytes.rate_pcm_port_0_server_pcm_005: + - server_pcm_005 + - network.incoming.bytes.rate_pcm_port_0 + feature_server_pcm_server_pcm_005: + - server_pcm_005 + - feature_server_pcm + disk.device.read.bytes.rate_server_pcm: + - server_pcm + - disk.device.read.bytes.rate + disk.device.write.requests.rate_server_pcm_server_pcm_005: + - server_pcm_005 + - disk.device.write.requests.rate_server_pcm + binding_pcm_port_0_server_pcm_005: + - server_pcm_005 + - binding_pcm_port_0 + disk.write.requests.rate_server_pcm: + - server_pcm + - disk.write.requests.rate + disk.device.write.bytes.rate_server_pcm: + - server_pcm + - disk.device.write.bytes.rate + disk.device.allocation_server_pcm_server_pcm_005: + - server_pcm_005 + - disk.device.allocation_server_pcm + network.incoming.packets_pcm_port_1_server_pcm_005: + - server_pcm_005 + - network.incoming.packets_pcm_port_1 + attachment_network_server_pcm_005: + - server_pcm_005 + - attachment_network + network.outgoing.bytes.rate_pcm_port_1: + - pcm_port_1 + - network.outgoing.bytes.rate + network.incoming.packets_pcm_port_0: - pcm_port_0 - - attachment - attachment_pcm_port_1: + - network.incoming.packets + network.outgoing.bytes.rate_pcm_port_0: + - pcm_port_0 + - network.outgoing.bytes.rate + end_point_network_server_pcm_005: + - server_pcm_005 + - end_point_network + network.incoming.packets_pcm_port_1: - pcm_port_1 - - attachment - attachment_pcm_port_1_server_pcm_005: + - network.incoming.packets + disk.root.size_server_pcm_server_pcm_005: - server_pcm_005 - - attachment_pcm_port_1 - requirements: - link_pcm_port_0: + - disk.root.size_server_pcm + instance_server_pcm: + - server_pcm + - instance + cpu.delta_server_pcm_server_pcm_005: + - server_pcm_005 + - cpu.delta_server_pcm + network.incoming.bytes.rate_pcm_port_0: - pcm_port_0 - - link - link_pcm_port_1: + - network.incoming.bytes.rate + network.incoming.bytes.rate_pcm_port_1: - pcm_port_1 - - link + - network.incoming.bytes.rate + requirements: + dependency_server_pcm_005: + - server_pcm_005 + - dependency link_pcm_port_1_server_pcm_005: - server_pcm_005 - link_pcm_port_1 - link_pcm_port_0_server_pcm_005: + dependency_pcm_port_1_server_pcm_005: - server_pcm_005 - - link_pcm_port_0 + - dependency_pcm_port_1 local_storage_server_pcm: - server_pcm - local_storage + dependency_pcm_port_0_server_pcm_005: + - server_pcm_005 + - dependency_pcm_port_0 + dependency_pcm_port_0: + - pcm_port_0 + - dependency + dependency_server_pcm: + - server_pcm + - dependency local_storage_server_pcm_server_pcm_005: - server_pcm_005 - - local_storage_server_pcm
\ No newline at end of file + - local_storage_server_pcm + dependency_pcm_port_1: + - pcm_port_1 + - dependency + dependency_server_pcm_server_pcm_005: + - server_pcm_005 + - dependency_server_pcm + link_pcm_port_0: + - pcm_port_0 + - link + link_pcm_port_1: + - pcm_port_1 + - link + dependency_network: + - network + - dependency + link_pcm_port_0_server_pcm_005: + - server_pcm_005 + - link_pcm_port_0 + dependency_network_server_pcm_005: + - server_pcm_005 + - dependency_network
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml index a80a5811b1..16b003af18 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: nested-pcm_v0.1_2 imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml node_types: org.openecomp.resource.vfc.nodes.heat.pcm_server: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server @@ -103,11 +79,21 @@ topology_template: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: - ip_address: get_input: oam_net_ip + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -124,18 +110,28 @@ topology_template: get_input: availabilityzone_name image: get_input: pcm_image_name - config_drive: 'True' + config_drive: true user_data_format: RAW name: get_input: pcm_server_name pcm_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: - ip_address: get_input: cps_net_ip + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: cps network: get_input: cps_net_name requirements: @@ -149,7 +145,7 @@ topology_template: network_name: get_input: cps_net_name groups: - nested-pcm_v0.1_2: + nested-pcm_v0.1_2_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/nested-pcm_v0.1_2.yaml @@ -166,33 +162,207 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1_2 capabilities: - endpoint_server_pcm: + network.incoming.packets.rate_pcm_port_0: + - pcm_port_0 + - network.incoming.packets.rate + cpu_server_pcm: - server_pcm - - endpoint + - 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 + 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 + memory.usage_server_pcm: + - server_pcm + - memory.usage + disk.read.requests_server_pcm: + - server_pcm + - disk.read.requests link_network: - network - link + disk.capacity_server_pcm: + - server_pcm + - disk.capacity os_server_pcm: - server_pcm - os - host_server_pcm: + disk.read.bytes_server_pcm: - server_pcm - - host - scalable_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 - - scalable + - 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 + endpoint_server_pcm: + - server_pcm + - endpoint + disk.device.read.requests.rate_server_pcm: + - server_pcm + - disk.device.read.requests.rate + end_point_network: + - network + - end_point + vcpus_server_pcm: + - server_pcm + - vcpus attachment_network: - network - attachment + disk.write.bytes_server_pcm: + - server_pcm + - disk.write.bytes + disk.iops_server_pcm: + - server_pcm + - disk.iops + disk.read.bytes.rate_server_pcm: + - server_pcm + - disk.read.bytes.rate + disk.device.allocation_server_pcm: + - server_pcm + - disk.device.allocation + scalable_server_pcm: + - server_pcm + - scalable + feature_network: + - network + - feature + disk.device.read.bytes.rate_server_pcm: + - server_pcm + - disk.device.read.bytes.rate + cpu_util_server_pcm: + - server_pcm + - cpu_util + disk.write.requests.rate_server_pcm: + - server_pcm + - disk.write.requests.rate + disk.device.write.bytes.rate_server_pcm: + - server_pcm + - disk.device.write.bytes.rate + host_server_pcm: + - server_pcm + - host + cpu.delta_server_pcm: + - server_pcm + - cpu.delta + 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 - attachment_pcm_port_0: + network.outgoing.bytes.rate_pcm_port_0: - pcm_port_0 - - attachment - attachment_pcm_port_1: + - network.outgoing.bytes.rate + disk.device.capacity_server_pcm: + - server_pcm + - disk.device.capacity + network.incoming.packets_pcm_port_1: - pcm_port_1 - - attachment + - 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.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.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 @@ -200,6 +370,18 @@ topology_template: link_pcm_port_1: - pcm_port_1 - link + dependency_network: + - network + - dependency local_storage_server_pcm: - server_pcm - - local_storage
\ No newline at end of file + - local_storage + dependency_pcm_port_0: + - pcm_port_0 + - dependency + dependency_server_pcm: + - server_pcm + - dependency + dependency_pcm_port_1: + - pcm_port_1 + - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/inputs/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/inputs/MANIFEST.json index b4a1b43a1e..0e7e10bb2e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/inputs/MANIFEST.json +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/inputs/MANIFEST.json @@ -11,14 +11,17 @@ "file": "hot-nimbus-pcm_v0.4.env", "type": "HEAT_ENV" } - ] - },{ + ] + }, + { "file": "nested-pcm_v0.1.yaml", "type": "HEAT" - },{ + }, + { "file": "hot-nimbus-pcm_v0.4_2.yaml", "type": "HEAT" - },{ + }, + { "file": "nested-pcm_v0.1_2.yaml", "type": "HEAT" } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 15b5e3b3a8..6549b60e5e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -2,32 +2,8 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: GlobalSubstitutionTypes imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml +- openecomp_heat_index: + file: openecomp-heat/_index.yml node_types: org.openecomp.resource.abstract.nodes.heat.mvs.nested.heat: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute @@ -35,9 +11,13 @@ node_types: vf_module_id: type: string description: Unique ID for this VF_MODULE instance + required: true + status: SUPPORTED vf_name: type: string description: The VF Name; defaults to VMVM for the virtual MVM VNF. + required: true + status: SUPPORTED constraints: - pattern: '[a-zA-Z0-9]+' - max_length: 4 @@ -45,9 +25,13 @@ node_types: cloud_zone_id: type: string description: The cloud zone for this VF instance + required: true + status: SUPPORTED vf_instance_num: type: string description: The number for this VF instance + required: true + status: SUPPORTED constraints: - pattern: '[0-9]+' - max_length: 2 @@ -55,53 +39,71 @@ node_types: virtual_mgmt_ip_0: type: string description: Virtual management network ip address + required: true + status: SUPPORTED indx: type: float description: Index of the current instance + required: true + status: SUPPORTED mvs_mgmt_ip_0: type: list description: List of Management network IP addresses for IPv4 + required: true + status: SUPPORTED entry_schema: type: string flavor: type: string description: Server flavor - constraints: [ - ] + required: true + status: SUPPORTED key_name: type: string description: SSH key name - constraints: [ - ] + required: true + status: SUPPORTED vnf_id: type: string description: Unique ID for this VF instance + required: true + status: SUPPORTED availability_zone_0: type: list description: List of Availability Zone IDs or Names + required: true + status: SUPPORTED entry_schema: type: string mgmt_net_id: type: string description: Neutron UUID for the Management network - constraints: [ - ] + required: true + status: SUPPORTED vm_instance_num: type: list description: VM instance number list must be a list of three-digit numeric value + required: true + status: SUPPORTED entry_schema: type: string bootimage: type: string description: Master bootimage volume id + required: true + status: SUPPORTED sec_groups: type: list description: Security groups + required: true + status: SUPPORTED entry_schema: type: string vf_component: type: string description: The component that this VF instance is running + required: true + status: SUPPORTED constraints: - pattern: '[a-zA-Z0-9]+' - max_length: 3 @@ -109,9 +111,18 @@ node_types: attributes: vnfci_id_2: type: string + status: SUPPORTED vnfci_id_1: type: string + status: SUPPORTED requirements: + - dependency_vnfci: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - local_storage_vnfci: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage @@ -119,29 +130,296 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_mgmt_port: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_mgmt_port: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + disk.ephemeral.size_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.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_mgmt_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_vnfci: + type: org.openecomp.capabilities.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_vnfci: + type: org.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_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.capabilities.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_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.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_mgmt_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.resident_vnfci: + type: org.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_vnfci: type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED + memory.usage_vnfci: + type: org.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_mgmt_port: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED + disk.device.write.bytes.rate_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.capabilities.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_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.capabilities.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_vnfci: + type: org.openecomp.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_vnfci: + type: org.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_vnfci: + type: org.openecomp.capabilities.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_vnfci: + type: org.openecomp.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_mgmt_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.capacity_vnfci: + type: org.openecomp.capabilities.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_vnfci: + type: org.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_mgmt_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + network.outgoing.bytes_mgmt_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_mgmt_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 + instance_vnfci: + type: org.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_mgmt_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.capabilities.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_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.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_mgmt_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_vnfci: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + memory_vnfci: + type: org.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_vnfci: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED + binding_vnfci: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + scalable_vnfci: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_vnfci: + type: org.openecomp.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_mgmt_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + vcpus_vnfci: + type: org.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_vnfci: + type: org.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_vnfci: type: tosca.capabilities.Container valid_source_types: @@ -149,13 +427,27 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_vnfci: - type: tosca.capabilities.network.Bindable + disk.device.allocation_vnfci: + type: org.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_vnfci: - type: tosca.capabilities.Scalable + network.incoming.bytes.rate_mgmt_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.requests_vnfci: + type: org.openecomp.capabilities.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_vnfci: + type: org.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/heat/nested/resourceGroupIndexVar/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/MainServiceTemplate.yaml index b07fa5b70b..d24a02ca03 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/MainServiceTemplate.yaml @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: Main imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml node_types: org.openecomp.resource.vfc.nodes.heat.compute: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server @@ -556,7 +532,7 @@ topology_template: - 1 name: compute_name groups: - mvs.vfmodule.heat: + mvs.vfmodule.heat_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/mvs.vfmodule.heat.yaml diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml index 11369f9b68..0d84b3fc0e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: mvs.nested.heat imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml node_types: org.openecomp.resource.vfc.nodes.heat.vnfci: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server @@ -174,6 +150,12 @@ topology_template: mgmt_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: true security_groups: - get_input: sec_groups fixed_ips: @@ -182,6 +164,9 @@ topology_template: - get_input: indx - get_input: - get_input: mvs_mgmt_ip_0 + mac_requirements: + mac_count_required: + is_required: false allowed_address_pairs: - ip_address: get_input: virtual_mgmt_ip_0 @@ -202,6 +187,7 @@ topology_template: get_input: vf_component $VF_INSTANCE_NUM: get_input: vf_instance_num + network_role_tag: mgmt network: get_input: mgmt_net_id requirements: @@ -210,7 +196,7 @@ topology_template: node: vnfci relationship: tosca.relationships.network.BindsTo groups: - mvs.nested.heat: + mvs.nested.heat_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/mvs.nested.heat.yaml @@ -227,25 +213,169 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.mvs.nested.heat capabilities: + disk.ephemeral.size_vnfci: + - vnfci + - disk.ephemeral.size + disk.iops_vnfci: + - vnfci + - disk.iops + network.outgoing.bytes.rate_mgmt_port: + - mgmt_port + - network.outgoing.bytes.rate + disk.device.write.bytes_vnfci: + - vnfci + - disk.device.write.bytes + disk.device.iops_vnfci: + - vnfci + - disk.device.iops + cpu_util_vnfci: + - vnfci + - cpu_util + disk.write.bytes.rate_vnfci: + - vnfci + - disk.write.bytes.rate + disk.device.latency_vnfci: + - vnfci + - disk.device.latency + disk.latency_vnfci: + - vnfci + - disk.latency + disk.write.requests_vnfci: + - vnfci + - disk.write.requests + network.outpoing.packets_mgmt_port: + - mgmt_port + - network.outpoing.packets + memory.resident_vnfci: + - vnfci + - memory.resident os_vnfci: - vnfci - os + memory.usage_vnfci: + - vnfci + - memory.usage attachment_mgmt_port: - mgmt_port - attachment + disk.device.write.bytes.rate_vnfci: + - vnfci + - disk.device.write.bytes.rate + disk.root.size_vnfci: + - vnfci + - disk.root.size + disk.device.usage_vnfci: + - vnfci + - disk.device.usage + disk.read.bytes_vnfci: + - vnfci + - disk.read.bytes + disk.device.read.bytes.rate_vnfci: + - vnfci + - disk.device.read.bytes.rate + disk.read.bytes.rate_vnfci: + - vnfci + - disk.read.bytes.rate + cpu_vnfci: + - vnfci + - cpu + disk.device.write.requests.rate_vnfci: + - vnfci + - disk.device.write.requests.rate + network.incoming.bytes_mgmt_port: + - mgmt_port + - network.incoming.bytes + disk.capacity_vnfci: + - vnfci + - disk.capacity + disk.device.read.requests_vnfci: + - vnfci + - disk.device.read.requests + binding_mgmt_port: + - mgmt_port + - binding + network.outgoing.bytes_mgmt_port: + - mgmt_port + - network.outgoing.bytes + network.incoming.packets_mgmt_port: + - mgmt_port + - network.incoming.packets + instance_vnfci: + - vnfci + - instance + feature_mgmt_port: + - mgmt_port + - feature + disk.device.read.bytes_vnfci: + - vnfci + - disk.device.read.bytes + disk.allocation_vnfci: + - vnfci + - disk.allocation + disk.write.requests.rate_vnfci: + - vnfci + - disk.write.requests.rate + disk.write.bytes_vnfci: + - vnfci + - disk.write.bytes + disk.device.write.requests_vnfci: + - vnfci + - disk.device.write.requests + disk.usage_vnfci: + - vnfci + - disk.usage + network.incoming.packets.rate_mgmt_port: + - mgmt_port + - network.incoming.packets.rate + feature_vnfci: + - vnfci + - feature + memory_vnfci: + - vnfci + - memory endpoint_vnfci: - vnfci - endpoint - host_vnfci: - - vnfci - - host binding_vnfci: - vnfci - binding scalable_vnfci: - vnfci - scalable + disk.device.capacity_vnfci: + - vnfci + - disk.device.capacity + network.outgoing.packets.rate_mgmt_port: + - mgmt_port + - network.outgoing.packets.rate + vcpus_vnfci: + - vnfci + - vcpus + cpu.delta_vnfci: + - vnfci + - cpu.delta + host_vnfci: + - vnfci + - host + disk.device.allocation_vnfci: + - vnfci + - disk.device.allocation + network.incoming.bytes.rate_mgmt_port: + - mgmt_port + - network.incoming.bytes.rate + disk.read.requests_vnfci: + - vnfci + - disk.read.requests + disk.device.read.requests.rate_vnfci: + - vnfci + - disk.device.read.requests.rate requirements: + dependency_mgmt_port: + - mgmt_port + - dependency + dependency_vnfci: + - vnfci + - dependency local_storage_vnfci: - vnfci - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupInvalid/inputs/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupInvalid/inputs/MANIFEST.json deleted file mode 100644 index c7729c8653..0000000000 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupInvalid/inputs/MANIFEST.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "mvs.vfmodule.heat.yaml", - "description": "Metaswitch MVS (Metaview Server)", - "version": "2013-05-23", - "data": [ - { - "file": "mvs.vfmodule.heat.yaml", - "type": "HEAT", - "data": [ - ] - }, - { - "file": "mvs.nested.heat.yaml", - "type": "HEAT", - "data": [ - ] - } - ] -}
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupInvalid/inputs/mvs.nested.heat.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupInvalid/inputs/mvs.nested.heat.yaml deleted file mode 100644 index 01adb51d71..0000000000 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupInvalid/inputs/mvs.nested.heat.yaml +++ /dev/null @@ -1,129 +0,0 @@ -heat_template_version: 2013-05-23 - -description: > - Metaswitch MVS (Metaview Server) - -parameters: - cloud_zone_id: - type: string - description: The cloud zone for this VF instance - vf_name: - type: string - description: The VF Name; defaults to VMVM for the virtual MVM VNF. - constraints: - - allowed_pattern: "[a-zA-Z0-9]+" - - length: { min: 4, max: 4 } - description: Each VF will have a 4-character alphanumeric identifier - vf_instance_num: - type: string - description: The number for this VF instance - constraints: - - allowed_pattern: "[0-9]+" - - length: { min: 2, max: 2 } - description: VF instance number must be a two-digit numeric value - vf_component: - type: string - description: The component that this VF instance is running - constraints: - - allowed_pattern: "[a-zA-Z0-9]+" - - length: { min: 3, max: 3 } - description: Each VF component will have a 3-character alphanumeric identifier - vm_instance_num: - type: comma_delimited_list - description: VM instance number list must be a list of three-digit numeric value - vnf_id: - type: string - description: Unique ID for this VF instance - vf_module_id: - type: string - description: Unique ID for this VF_MODULE instance - bootimage: - type: string - description: Master bootimage volume id - flavor: - type: string - description: Server flavor - constraints: - - custom_constraint: nova.flavor - key_name: - type: string - description: SSH key name - constraints: - - custom_constraint: nova.keypair - - availability_zone_0: - type: comma_delimited_list - description: List of Availability Zone IDs or Names - - sec_groups: - type: comma_delimited_list - description: Security groups - mgmt_net_id: - type: string - description: Neutron UUID for the Management network - constraints: - - custom_constraint: neutron.network - virtual_mgmt_ip_0: - type: string - description: Virtual management network ip address - - mvs_mgmt_ip_0: - type: comma_delimited_list - description: List of Management network IP addresses for IPv4 - - indx: - type: number - description: Index of the current instance - -resources: - mgmt_port: - type: OS::Neutron::Port - properties: - name: - str_replace: - template: Z$CLOUD_ZONE_ID$VF_NAME$VF_INSTANCE_NUM$VF_COMPONENT$VM_INSTANCE_NUM-mgmt-port - params: - $CLOUD_ZONE_ID: { get_param: cloud_zone_id } - $VF_NAME: { get_param: vf_name } - $VF_INSTANCE_NUM: { get_param: vf_instance_num } - $VF_COMPONENT: { get_param: vf_component } - $VM_INSTANCE_NUM: { "Fn::Select" : [ { get_param: indx }, { get_param: [vm_instance_num] } ] } - network_id: { get_param: mgmt_net_id } - security_groups: [{ get_param: sec_groups }] - - fixed_ips: - - ip_address: { "Fn::Select" : [ { get_param: indx }, { get_param: [{ get_param: mvs_mgmt_ip_0 }] } ] } - - allowed_address_pairs: - - ip_address: { get_param: virtual_mgmt_ip_0 } - - - - vnfci: - type: OS::Nova::Server - properties: - name: - str_replace: - template: Z$CLOUD_ZONE_ID$VF_NAME$VF_INSTANCE_NUM$VF_COMPONENT$VM_INSTANCE_NUM - params: - $CLOUD_ZONE_ID: { get_param: cloud_zone_id } - $VF_NAME: { get_param: vf_name } - $VF_INSTANCE_NUM: { get_param: vf_instance_num } - $VF_COMPONENT: { get_param: vf_component } - $VM_INSTANCE_NUM: { "Fn::Select" : [ { get_param: indx }, { get_param: [vm_instance_num] } ] } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: mgmt_port } - - availability_zone: { "Fn::Select" : [ { get_param: indx }, { get_param: [availability_zone_0] } ] } - - metadata: - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - -outputs: - vnfci_id_1: - value: { get_resource: vnfci } - vnfci_id_2: - value: { get_resource: vnfci }
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupInvalid/inputs/mvs.vfmodule.heat.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupInvalid/inputs/mvs.vfmodule.heat.yaml deleted file mode 100644 index d71dd81fbf..0000000000 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupInvalid/inputs/mvs.vfmodule.heat.yaml +++ /dev/null @@ -1,166 +0,0 @@ -heat_template_version: 2013-05-23 - -description: > - Metaswitch MVS (Metaview Server) - -parameters: - cloud_zone_id: - type: string - description: The cloud zone for this VF instance - index_parameter: - type: string - vf_name: - type: string - description: The VF Name; defaults to VMVM for the virtual MVM VNF. - constraints: - - allowed_pattern: "[a-zA-Z0-9]+" - - length: { min: 4, max: 4 } - description: Each VF will have a 4-character alphanumeric identifier - vf_instance_num: - type: string - description: The number for this VF instance - constraints: - - allowed_pattern: "[0-9]+" - - length: { min: 2, max: 2 } - description: VF instance number must be a two-digit numeric value - vf_component: - type: string - description: The component that this VF instance is running - constraints: - - allowed_pattern: "[a-zA-Z0-9]+" - - length: { min: 3, max: 3 } - description: Each VF component will have a 3-character alphanumeric identifier - vm_instance_num: - type: comma_delimited_list - description: VM instance number list must be a list of three-digit numeric value - vnf_id: - type: string - description: Unique ID for this VF instance - vf_module_id: - type: string - description: Unique ID for this VF_MODULE instance - bootimage: - type: string - description: Master bootimage volume id - flavor: - type: string - description: Server flavor - constraints: - - custom_constraint: nova.flavor - key_name: - type: string - description: SSH key name - constraints: - - custom_constraint: nova.keypair - type_name: - type: string - availability_zone_0: - type: comma_delimited_list - description: List of Availability Zone IDs or Names - - sec_groups: - type: comma_delimited_list - description: Security groups - mgmt_net_id: - type: string - description: Neutron UUID for the Management network - constraints: - - custom_constraint: neutron.network - virtual_mgmt_ip_0: - type: string - description: Virtual management network ip address - - mvs_mgmt_ip_0: - type: comma_delimited_list - description: List of Management network IP addresses for IPv4 - - num_instances: - type: number - description: number of instance of the VF_module - - compute_image_name: - type: string - -resources: - mvs_modules: - type: OS::Heat::ResourceGroup - properties: - count: 3 - index_var: { get_param: index_parameter } - resource_def: - type: mvs.nested.heat.yaml - properties: - cloud_zone_id: { get_param: cloud_zone_id } - vf_name: { get_param: vf_name } - vf_instance_num: { get_param: vf_instance_num } - vf_component: { get_param: vf_component } - vm_instance_num: { get_param: vm_instance_num } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - bootimage: { get_param: bootimage } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - availability_zone_0: { get_param: availability_zone_0 } - sec_groups: { get_param: sec_groups } - mgmt_net_id: { get_param: mgmt_net_id } - virtual_mgmt_ip_0: { get_param: virtual_mgmt_ip_0 } - mvs_mgmt_ip_0: { get_param: mvs_mgmt_ip_0 } - indx: "%index%" - - not_supported_resourceGroup1: - type: OS::Heat::ResourceGroup - properties: - count: 3 - resource_def: - type: OS::Heat::ResourceGroup - properties: - cloud_zone_id: { get_param: cloud_zone_id } - vf_name: { get_param: vf_name } - vf_instance_num: { get_param: vf_instance_num } - vf_component: { get_param: vf_component } - vm_instance_num: { get_param: vm_instance_num } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - bootimage: { get_param: bootimage } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - availability_zone_0: { get_param: availability_zone_0 } - sec_groups: { get_param: sec_groups } - mgmt_net_id: { get_param: mgmt_net_id } - virtual_mgmt_ip_0: { get_param: virtual_mgmt_ip_0 } - mvs_mgmt_ip_0: { get_param: mvs_mgmt_ip_0 } - indx: "%index%" - - not_supported_resourceGroup2: - type: OS::Heat::ResourceGroup - properties: - count: 3 - resource_def: - type: { get_param: type_name } - properties: - cloud_zone_id: { get_param: cloud_zone_id } - vf_name: { get_param: vf_name } - vf_instance_num: { get_param: vf_instance_num } - vf_component: { get_param: vf_component } - vm_instance_num: { get_param: vm_instance_num } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - bootimage: { get_param: bootimage } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - availability_zone_0: { get_param: availability_zone_0 } - sec_groups: { get_param: sec_groups } - mgmt_net_id: { get_param: mgmt_net_id } - virtual_mgmt_ip_0: { get_param: virtual_mgmt_ip_0 } - mvs_mgmt_ip_0: { get_param: mvs_mgmt_ip_0 } - indx: "%index%" - - server_compute_get_attr_test: - type: OS::Nova::Server - properties: - config_drive: {get_attr: [mvs_modules]} - name: compute_name - image: { get_param: compute_image_name } - flavor: compute_flavor_name - user_data_format: { get_attr: [mvs_modules , resource.1.vnfci_id_1] } - user_data: { get_attr: [mvs_modules, resource.vnfci_id_2]} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index ec3b692135..dc01287086 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -2,32 +2,8 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: GlobalSubstitutionTypes imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml +- openecomp_heat_index: + file: openecomp-heat/_index.yml node_types: org.openecomp.resource.abstract.nodes.heat.dns_nested_01: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute @@ -35,77 +11,130 @@ node_types: vf_module_id: type: string description: Unique ID for this VF module instance + required: true + status: SUPPORTED name_with_index: type: string description: name parameter which will include the index value + required: true + status: SUPPORTED dns_int_bearer_ips: type: list description: DNS Bearer IP list + required: true + status: SUPPORTED entry_schema: type: string vnf_name: type: string description: Unique name for this VF instance + required: true + status: SUPPORTED index: type: float description: index parameter + required: true + status: SUPPORTED security_group: type: string description: security group + required: true + status: SUPPORTED oam_protected_net_name: type: string description: OAM network where instaces will connect + required: true + status: SUPPORTED dns_oam_protected_ips: type: list description: DNS OAM IP list + required: true + status: SUPPORTED entry_schema: type: string dns_key: type: string description: server key + required: true + status: SUPPORTED int_bearer_net_name: type: string description: Bearer network where instaces will connect + required: true + status: SUPPORTED route_eth0: type: string description: OAM network routes + required: true + status: SUPPORTED dns_names: type: list description: server name + required: true + status: SUPPORTED entry_schema: type: string vnf_id: type: string description: Unique ID for this VF instance + required: true + status: SUPPORTED availability_zone_0: type: string description: availability zone ID or Name + required: true + status: SUPPORTED dns_image_name: type: string description: server image + required: true + status: SUPPORTED dns_int_bearer_ipv6_ips: type: list description: fixed IPv6 assignment for VM's on the Bearer network + required: true + status: SUPPORTED entry_schema: type: string dns_flavor_name: type: string description: server flavor + required: true + status: SUPPORTED requirements: + - dependency_dns_oam_protected_0_port: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_dns_oam_protected_0_port: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_dns_int_bearer_0_port: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_dns_int_bearer_0_port: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_dns_servers: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - local_storage_dns_servers: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage @@ -114,6 +143,120 @@ node_types: - 0 - UNBOUNDED capabilities: + disk.read.bytes.rate_dns_servers: + type: org.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_dns_oam_protected_0_port: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_dns_int_bearer_0_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.resident_dns_servers: + type: org.openecomp.capabilities.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_dns_servers: + type: org.openecomp.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_dns_servers: + type: org.openecomp.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_dns_servers: + type: org.openecomp.capabilities.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_dns_servers: + type: org.openecomp.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_dns_oam_protected_0_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_dns_int_bearer_0_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_dns_int_bearer_0_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes_dns_servers: + type: org.openecomp.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_dns_servers: + type: org.openecomp.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_dns_int_bearer_0_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_dns_oam_protected_0_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.device.iops_dns_servers: + type: org.openecomp.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_dns_servers: + type: org.openecomp.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_dns_oam_protected_0_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_dns_servers: + type: org.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_dns_servers: type: tosca.capabilities.Container valid_source_types: @@ -121,13 +264,193 @@ node_types: occurrences: - 1 - UNBOUNDED + cpu.delta_dns_servers: + type: org.openecomp.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_dns_oam_protected_0_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_dns_servers: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + instance_dns_servers: + type: org.openecomp.capabilities.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_dns_servers: + type: org.openecomp.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_dns_servers: + type: org.openecomp.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_dns_servers: + type: org.openecomp.capabilities.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_dns_servers: + type: org.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_dns_servers: + type: org.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_dns_servers: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_dns_int_bearer_0_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_dns_oam_protected_0_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes_dns_servers: + type: org.openecomp.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_dns_oam_protected_0_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_dns_oam_protected_0_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.requests_dns_servers: + type: org.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_dns_servers: + type: org.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_dns_servers: + type: org.openecomp.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_dns_int_bearer_0_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_dns_oam_protected_0_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory_dns_servers: + type: org.openecomp.capabilities.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_dns_servers: + type: org.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_dns_int_bearer_0_port: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - attachment_dns_oam_protected_0_port: - type: tosca.capabilities.Attachment + disk.device.latency_dns_servers: + type: org.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_dns_int_bearer_0_port: + 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_dns_servers: + type: org.openecomp.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_dns_servers: + type: org.openecomp.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_dns_oam_protected_0_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests_dns_servers: + type: org.openecomp.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_dns_servers: + type: org.openecomp.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_dns_int_bearer_0_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_dns_int_bearer_0_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -136,13 +459,54 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_dns_oam_protected_0_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_dns_int_bearer_0_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED endpoint_dns_servers: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - binding_dns_servers: - type: tosca.capabilities.network.Bindable + cpu_util_dns_servers: + type: org.openecomp.capabilities.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_dns_servers: + type: org.openecomp.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_dns_servers: + type: org.openecomp.capabilities.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_dns_servers: + type: org.openecomp.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_dns_servers: + type: org.openecomp.capabilities.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_dns_servers: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/MainServiceTemplate.yaml index 6eae1ff185..45de38a378 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/MainServiceTemplate.yaml @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: Main imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml topology_template: inputs: vf_module_id: @@ -221,15 +197,15 @@ topology_template: direction: ingress requirements: - port: - capability: attachment_dns_int_bearer_0_port + capability: attachment_dns_oam_protected_0_port node: dns_server_group_az relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_dns_oam_protected_0_port + capability: attachment_dns_int_bearer_0_port node: dns_server_group_az relationship: org.openecomp.relationships.AttachesTo groups: - base_dns: + base_dns_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/base_dns.yaml @@ -237,7 +213,7 @@ topology_template: Base HOT template to create The Security Group for the the DNS VNF members: - DNS_SECURITY_GROUP - dns_az_01: + dns_az_01_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/dns_az_01.yaml diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/dns_nested_01ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/dns_nested_01ServiceTemplate.yaml index db6b3a0179..b777782c3e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/dns_nested_01ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/dns_nested_01ServiceTemplate.yaml @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: dns_nested_01 imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml node_types: org.openecomp.resource.vfc.nodes.heat.dns: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server @@ -132,6 +108,12 @@ topology_template: dns_oam_protected_0_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group fixed_ips: @@ -139,12 +121,16 @@ topology_template: get_input: - dns_oam_protected_ips - get_input: index + mac_requirements: + mac_count_required: + is_required: false name: str_replace: template: VNF_NAME_dns_oam_port params: VNF_NAME: get_input: vnf_name + network_role_tag: oam_protected network: get_input: oam_protected_net_name requirements: @@ -155,6 +141,12 @@ topology_template: dns_int_bearer_0_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group fixed_ips: @@ -166,12 +158,16 @@ topology_template: get_input: - dns_int_bearer_ipv6_ips - get_input: index + mac_requirements: + mac_count_required: + is_required: false name: str_replace: template: VNF_NAME_dns_bearer_port params: VNF_NAME: get_input: vnf_name + network_role_tag: int_bearer network: get_input: int_bearer_net_name requirements: @@ -202,7 +198,7 @@ topology_template: - dns_names - get_input: index groups: - dns_nested_01: + dns_nested_01_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/dns_nested_01.yaml @@ -216,24 +212,192 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.dns_nested_01 capabilities: + disk.read.bytes.rate_dns_servers: + - dns_servers + - disk.read.bytes.rate + attachment_dns_oam_protected_0_port: + - dns_oam_protected_0_port + - attachment + network.outpoing.packets_dns_int_bearer_0_port: + - dns_int_bearer_0_port + - network.outpoing.packets + memory.resident_dns_servers: + - dns_servers + - memory.resident + disk.device.write.requests.rate_dns_servers: + - dns_servers + - disk.device.write.requests.rate + disk.root.size_dns_servers: + - dns_servers + - disk.root.size + disk.write.requests.rate_dns_servers: + - dns_servers + - disk.write.requests.rate + disk.device.write.requests_dns_servers: + - dns_servers + - disk.device.write.requests + network.incoming.bytes_dns_oam_protected_0_port: + - dns_oam_protected_0_port + - network.incoming.bytes + network.incoming.packets.rate_dns_int_bearer_0_port: + - dns_int_bearer_0_port + - network.incoming.packets.rate + network.incoming.bytes.rate_dns_int_bearer_0_port: + - dns_int_bearer_0_port + - network.incoming.bytes.rate + disk.read.bytes_dns_servers: + - dns_servers + - disk.read.bytes + disk.capacity_dns_servers: + - dns_servers + - disk.capacity + network.outgoing.packets.rate_dns_int_bearer_0_port: + - dns_int_bearer_0_port + - network.outgoing.packets.rate + binding_dns_oam_protected_0_port: + - dns_oam_protected_0_port + - binding + disk.device.iops_dns_servers: + - dns_servers + - disk.device.iops + disk.read.requests_dns_servers: + - dns_servers + - disk.read.requests + network.outpoing.packets_dns_oam_protected_0_port: + - dns_oam_protected_0_port + - network.outpoing.packets + disk.device.capacity_dns_servers: + - dns_servers + - disk.device.capacity host_dns_servers: - dns_servers - host + cpu.delta_dns_servers: + - dns_servers + - cpu.delta + network.incoming.bytes.rate_dns_oam_protected_0_port: + - dns_oam_protected_0_port + - network.incoming.bytes.rate + binding_dns_servers: + - dns_servers + - binding + instance_dns_servers: + - dns_servers + - instance + disk.device.read.requests.rate_dns_servers: + - dns_servers + - disk.device.read.requests.rate + disk.allocation_dns_servers: + - dns_servers + - disk.allocation + disk.ephemeral.size_dns_servers: + - dns_servers + - disk.ephemeral.size + disk.device.read.bytes_dns_servers: + - dns_servers + - disk.device.read.bytes + vcpus_dns_servers: + - dns_servers + - vcpus + feature_dns_servers: + - dns_servers + - feature + network.outgoing.bytes.rate_dns_int_bearer_0_port: + - dns_int_bearer_0_port + - network.outgoing.bytes.rate + network.outgoing.bytes.rate_dns_oam_protected_0_port: + - dns_oam_protected_0_port + - network.outgoing.bytes.rate + disk.write.bytes_dns_servers: + - dns_servers + - disk.write.bytes + network.outgoing.packets.rate_dns_oam_protected_0_port: + - dns_oam_protected_0_port + - network.outgoing.packets.rate + network.incoming.packets_dns_oam_protected_0_port: + - dns_oam_protected_0_port + - network.incoming.packets + disk.write.requests_dns_servers: + - dns_servers + - disk.write.requests + cpu_dns_servers: + - dns_servers + - cpu + memory.usage_dns_servers: + - dns_servers + - memory.usage + network.incoming.packets_dns_int_bearer_0_port: + - dns_int_bearer_0_port + - network.incoming.packets + network.incoming.packets.rate_dns_oam_protected_0_port: + - dns_oam_protected_0_port + - network.incoming.packets.rate + memory_dns_servers: + - dns_servers + - memory + disk.device.write.bytes.rate_dns_servers: + - dns_servers + - disk.device.write.bytes.rate attachment_dns_int_bearer_0_port: - dns_int_bearer_0_port - attachment - attachment_dns_oam_protected_0_port: + disk.device.latency_dns_servers: + - dns_servers + - disk.device.latency + binding_dns_int_bearer_0_port: + - dns_int_bearer_0_port + - binding + disk.device.read.bytes.rate_dns_servers: + - dns_servers + - disk.device.read.bytes.rate + disk.write.bytes.rate_dns_servers: + - dns_servers + - disk.write.bytes.rate + network.outgoing.bytes_dns_oam_protected_0_port: - dns_oam_protected_0_port - - attachment + - network.outgoing.bytes + disk.device.read.requests_dns_servers: + - dns_servers + - disk.device.read.requests + disk.iops_dns_servers: + - dns_servers + - disk.iops + network.outgoing.bytes_dns_int_bearer_0_port: + - dns_int_bearer_0_port + - network.outgoing.bytes + network.incoming.bytes_dns_int_bearer_0_port: + - dns_int_bearer_0_port + - network.incoming.bytes os_dns_servers: - dns_servers - os + feature_dns_oam_protected_0_port: + - dns_oam_protected_0_port + - feature + feature_dns_int_bearer_0_port: + - dns_int_bearer_0_port + - feature endpoint_dns_servers: - dns_servers - endpoint - binding_dns_servers: + cpu_util_dns_servers: - dns_servers - - binding + - cpu_util + disk.device.allocation_dns_servers: + - dns_servers + - disk.device.allocation + disk.latency_dns_servers: + - dns_servers + - disk.latency + disk.device.usage_dns_servers: + - dns_servers + - disk.device.usage + disk.usage_dns_servers: + - dns_servers + - disk.usage + disk.device.write.bytes_dns_servers: + - dns_servers + - disk.device.write.bytes scalable_dns_servers: - dns_servers - scalable @@ -241,9 +405,18 @@ topology_template: local_storage_dns_servers: - dns_servers - local_storage + dependency_dns_oam_protected_0_port: + - dns_oam_protected_0_port + - dependency link_dns_oam_protected_0_port: - dns_oam_protected_0_port - link + dependency_dns_servers: + - dns_servers + - dependency link_dns_int_bearer_0_port: - dns_int_bearer_0_port - - link
\ No newline at end of file + - link + dependency_dns_int_bearer_0_port: + - dns_int_bearer_0_port + - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/inputs/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/inputs/MANIFEST.json index 0fa0f714da..8f4e710501 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/inputs/MANIFEST.json +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/inputs/MANIFEST.json @@ -1,37 +1,37 @@ { - "name": "", - "description": "", - "data": [ + "name": "", + "description": "", + "data": [ + { + "file": "dns_nested_01.yaml", + "type": "HEAT", + "isBase": "false" + }, + { + "file": "base_dns.yaml", + "type": "HEAT", + "isBase": "true", + "data": [ { - "file": "dns_nested_01.yaml", - "type": "HEAT", - "isBase": "false" - }, - { - "file": "base_dns.yaml", - "type": "HEAT", - "isBase": "true", - "data": [ - { - "file": "base_dns.env", - "type": "HEAT_ENV" - } - ] - }, + "file": "base_dns.env", + "type": "HEAT_ENV" + } + ] + }, + { + "file": "dns_az_01.yaml", + "type": "HEAT", + "isBase": "false", + "data": [ { - "file": "dns_az_01.yaml", - "type": "HEAT", - "isBase": "false", - "data": [ - { - "file": "dns_az_01.env", - "type": "HEAT_ENV" - } - ] - }, - { - "file": "nimbus-willows-2.pem", - "type": "OTHER" + "file": "dns_az_01.env", + "type": "HEAT_ENV" } - ] + ] + }, + { + "file": "nimbus-willows-2.pem", + "type": "OTHER" + } + ] }
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 15b5e3b3a8..6549b60e5e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -2,32 +2,8 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: GlobalSubstitutionTypes imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml +- openecomp_heat_index: + file: openecomp-heat/_index.yml node_types: org.openecomp.resource.abstract.nodes.heat.mvs.nested.heat: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute @@ -35,9 +11,13 @@ node_types: vf_module_id: type: string description: Unique ID for this VF_MODULE instance + required: true + status: SUPPORTED vf_name: type: string description: The VF Name; defaults to VMVM for the virtual MVM VNF. + required: true + status: SUPPORTED constraints: - pattern: '[a-zA-Z0-9]+' - max_length: 4 @@ -45,9 +25,13 @@ node_types: cloud_zone_id: type: string description: The cloud zone for this VF instance + required: true + status: SUPPORTED vf_instance_num: type: string description: The number for this VF instance + required: true + status: SUPPORTED constraints: - pattern: '[0-9]+' - max_length: 2 @@ -55,53 +39,71 @@ node_types: virtual_mgmt_ip_0: type: string description: Virtual management network ip address + required: true + status: SUPPORTED indx: type: float description: Index of the current instance + required: true + status: SUPPORTED mvs_mgmt_ip_0: type: list description: List of Management network IP addresses for IPv4 + required: true + status: SUPPORTED entry_schema: type: string flavor: type: string description: Server flavor - constraints: [ - ] + required: true + status: SUPPORTED key_name: type: string description: SSH key name - constraints: [ - ] + required: true + status: SUPPORTED vnf_id: type: string description: Unique ID for this VF instance + required: true + status: SUPPORTED availability_zone_0: type: list description: List of Availability Zone IDs or Names + required: true + status: SUPPORTED entry_schema: type: string mgmt_net_id: type: string description: Neutron UUID for the Management network - constraints: [ - ] + required: true + status: SUPPORTED vm_instance_num: type: list description: VM instance number list must be a list of three-digit numeric value + required: true + status: SUPPORTED entry_schema: type: string bootimage: type: string description: Master bootimage volume id + required: true + status: SUPPORTED sec_groups: type: list description: Security groups + required: true + status: SUPPORTED entry_schema: type: string vf_component: type: string description: The component that this VF instance is running + required: true + status: SUPPORTED constraints: - pattern: '[a-zA-Z0-9]+' - max_length: 3 @@ -109,9 +111,18 @@ node_types: attributes: vnfci_id_2: type: string + status: SUPPORTED vnfci_id_1: type: string + status: SUPPORTED requirements: + - dependency_vnfci: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - local_storage_vnfci: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage @@ -119,29 +130,296 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_mgmt_port: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_mgmt_port: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + disk.ephemeral.size_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.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_mgmt_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_vnfci: + type: org.openecomp.capabilities.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_vnfci: + type: org.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_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.capabilities.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_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.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_mgmt_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.resident_vnfci: + type: org.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_vnfci: type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED + memory.usage_vnfci: + type: org.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_mgmt_port: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED + disk.device.write.bytes.rate_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.capabilities.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_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.capabilities.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_vnfci: + type: org.openecomp.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_vnfci: + type: org.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_vnfci: + type: org.openecomp.capabilities.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_vnfci: + type: org.openecomp.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_mgmt_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.capacity_vnfci: + type: org.openecomp.capabilities.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_vnfci: + type: org.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_mgmt_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + network.outgoing.bytes_mgmt_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_mgmt_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 + instance_vnfci: + type: org.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_mgmt_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.capabilities.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_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.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_mgmt_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_vnfci: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + memory_vnfci: + type: org.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_vnfci: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED + binding_vnfci: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + scalable_vnfci: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_vnfci: + type: org.openecomp.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_mgmt_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + vcpus_vnfci: + type: org.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_vnfci: + type: org.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_vnfci: type: tosca.capabilities.Container valid_source_types: @@ -149,13 +427,27 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_vnfci: - type: tosca.capabilities.network.Bindable + disk.device.allocation_vnfci: + type: org.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_vnfci: - type: tosca.capabilities.Scalable + network.incoming.bytes.rate_mgmt_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.requests_vnfci: + type: org.openecomp.capabilities.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_vnfci: + type: org.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/heat/nested/resource_group/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/MainServiceTemplate.yaml index 632afc51b3..6e7b3990c6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/MainServiceTemplate.yaml @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: Main imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml node_types: org.openecomp.resource.vfc.nodes.heat.compute: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server @@ -212,7 +188,7 @@ topology_template: - 1 name: compute_name groups: - mvs.vfmodule.heat: + mvs.vfmodule.heat_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/mvs.vfmodule.heat.yaml diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml index 11369f9b68..0d84b3fc0e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: mvs.nested.heat imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml node_types: org.openecomp.resource.vfc.nodes.heat.vnfci: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server @@ -174,6 +150,12 @@ topology_template: mgmt_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: true security_groups: - get_input: sec_groups fixed_ips: @@ -182,6 +164,9 @@ topology_template: - get_input: indx - get_input: - get_input: mvs_mgmt_ip_0 + mac_requirements: + mac_count_required: + is_required: false allowed_address_pairs: - ip_address: get_input: virtual_mgmt_ip_0 @@ -202,6 +187,7 @@ topology_template: get_input: vf_component $VF_INSTANCE_NUM: get_input: vf_instance_num + network_role_tag: mgmt network: get_input: mgmt_net_id requirements: @@ -210,7 +196,7 @@ topology_template: node: vnfci relationship: tosca.relationships.network.BindsTo groups: - mvs.nested.heat: + mvs.nested.heat_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/mvs.nested.heat.yaml @@ -227,25 +213,169 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.mvs.nested.heat capabilities: + disk.ephemeral.size_vnfci: + - vnfci + - disk.ephemeral.size + disk.iops_vnfci: + - vnfci + - disk.iops + network.outgoing.bytes.rate_mgmt_port: + - mgmt_port + - network.outgoing.bytes.rate + disk.device.write.bytes_vnfci: + - vnfci + - disk.device.write.bytes + disk.device.iops_vnfci: + - vnfci + - disk.device.iops + cpu_util_vnfci: + - vnfci + - cpu_util + disk.write.bytes.rate_vnfci: + - vnfci + - disk.write.bytes.rate + disk.device.latency_vnfci: + - vnfci + - disk.device.latency + disk.latency_vnfci: + - vnfci + - disk.latency + disk.write.requests_vnfci: + - vnfci + - disk.write.requests + network.outpoing.packets_mgmt_port: + - mgmt_port + - network.outpoing.packets + memory.resident_vnfci: + - vnfci + - memory.resident os_vnfci: - vnfci - os + memory.usage_vnfci: + - vnfci + - memory.usage attachment_mgmt_port: - mgmt_port - attachment + disk.device.write.bytes.rate_vnfci: + - vnfci + - disk.device.write.bytes.rate + disk.root.size_vnfci: + - vnfci + - disk.root.size + disk.device.usage_vnfci: + - vnfci + - disk.device.usage + disk.read.bytes_vnfci: + - vnfci + - disk.read.bytes + disk.device.read.bytes.rate_vnfci: + - vnfci + - disk.device.read.bytes.rate + disk.read.bytes.rate_vnfci: + - vnfci + - disk.read.bytes.rate + cpu_vnfci: + - vnfci + - cpu + disk.device.write.requests.rate_vnfci: + - vnfci + - disk.device.write.requests.rate + network.incoming.bytes_mgmt_port: + - mgmt_port + - network.incoming.bytes + disk.capacity_vnfci: + - vnfci + - disk.capacity + disk.device.read.requests_vnfci: + - vnfci + - disk.device.read.requests + binding_mgmt_port: + - mgmt_port + - binding + network.outgoing.bytes_mgmt_port: + - mgmt_port + - network.outgoing.bytes + network.incoming.packets_mgmt_port: + - mgmt_port + - network.incoming.packets + instance_vnfci: + - vnfci + - instance + feature_mgmt_port: + - mgmt_port + - feature + disk.device.read.bytes_vnfci: + - vnfci + - disk.device.read.bytes + disk.allocation_vnfci: + - vnfci + - disk.allocation + disk.write.requests.rate_vnfci: + - vnfci + - disk.write.requests.rate + disk.write.bytes_vnfci: + - vnfci + - disk.write.bytes + disk.device.write.requests_vnfci: + - vnfci + - disk.device.write.requests + disk.usage_vnfci: + - vnfci + - disk.usage + network.incoming.packets.rate_mgmt_port: + - mgmt_port + - network.incoming.packets.rate + feature_vnfci: + - vnfci + - feature + memory_vnfci: + - vnfci + - memory endpoint_vnfci: - vnfci - endpoint - host_vnfci: - - vnfci - - host binding_vnfci: - vnfci - binding scalable_vnfci: - vnfci - scalable + disk.device.capacity_vnfci: + - vnfci + - disk.device.capacity + network.outgoing.packets.rate_mgmt_port: + - mgmt_port + - network.outgoing.packets.rate + vcpus_vnfci: + - vnfci + - vcpus + cpu.delta_vnfci: + - vnfci + - cpu.delta + host_vnfci: + - vnfci + - host + disk.device.allocation_vnfci: + - vnfci + - disk.device.allocation + network.incoming.bytes.rate_mgmt_port: + - mgmt_port + - network.incoming.bytes.rate + disk.read.requests_vnfci: + - vnfci + - disk.read.requests + disk.device.read.requests.rate_vnfci: + - vnfci + - disk.device.read.requests.rate requirements: + dependency_mgmt_port: + - mgmt_port + - dependency + dependency_vnfci: + - vnfci + - dependency local_storage_vnfci: - vnfci - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 1b1c4dd621..e2c3da021d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -2,32 +2,8 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: GlobalSubstitutionTypes imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml +- openecomp_heat_index: + file: openecomp-heat/_index.yml node_types: org.openecomp.resource.abstract.nodes.heat.mvs.nested.heat: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute @@ -35,9 +11,13 @@ node_types: vf_module_id: type: string description: Unique ID for this VF_MODULE instance + required: true + status: SUPPORTED vf_name: type: string description: The VF Name; defaults to VMVM for the virtual MVM VNF. + required: true + status: SUPPORTED constraints: - pattern: '[a-zA-Z0-9]+' - max_length: 4 @@ -45,9 +25,13 @@ node_types: cloud_zone_id: type: string description: The cloud zone for this VF instance + required: true + status: SUPPORTED vf_instance_num: type: string description: The number for this VF instance + required: true + status: SUPPORTED constraints: - pattern: '[0-9]+' - max_length: 2 @@ -55,58 +39,90 @@ node_types: virtual_mgmt_ip_0: type: string description: Virtual management network ip address + required: true + status: SUPPORTED indx: type: float description: Index of the current instance + required: true + status: SUPPORTED mvs_mgmt_ip_0: type: list description: List of Management network IP addresses for IPv4 + required: true + status: SUPPORTED entry_schema: type: string flavor: type: string description: Server flavor - constraints: [ - ] + required: true + status: SUPPORTED key_name: type: string description: SSH key name - constraints: [ - ] + required: true + status: SUPPORTED vnf_id: type: string description: Unique ID for this VF instance + required: true + status: SUPPORTED availability_zone_0: type: list description: List of Availability Zone IDs or Names + required: true + status: SUPPORTED entry_schema: type: string mgmt_net_id: type: string description: Neutron UUID for the Management network - constraints: [ - ] + required: true + status: SUPPORTED vm_instance_num: type: list description: VM instance number list must be a list of three-digit numeric value + required: true + status: SUPPORTED entry_schema: type: string bootimage: type: string description: Master bootimage volume id + required: true + status: SUPPORTED sec_groups: type: list description: Security groups + required: true + status: SUPPORTED entry_schema: type: string vf_component: type: string description: The component that this VF instance is running + required: true + status: SUPPORTED constraints: - pattern: '[a-zA-Z0-9]+' - max_length: 3 - min_length: 3 requirements: + - dependency_boot_volume: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - dependency_vnfci: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - local_storage_vnfci: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage @@ -114,29 +130,318 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_data_volume: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - dependency_mgmt_port: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_mgmt_port: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + disk.ephemeral.size_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.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_mgmt_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_vnfci: + type: org.openecomp.capabilities.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_vnfci: + type: org.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_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.capabilities.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_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.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_vnfci: + type: org.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_data_volume: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_mgmt_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.resident_vnfci: + type: org.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_vnfci: type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED + memory.usage_vnfci: + type: org.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_mgmt_port: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED + disk.device.write.bytes.rate_vnfci: + type: org.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_boot_volume: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + feature_data_volume: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.root.size_vnfci: + type: org.openecomp.capabilities.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_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.capabilities.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_vnfci: + type: org.openecomp.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_vnfci: + type: org.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_vnfci: + type: org.openecomp.capabilities.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_vnfci: + type: org.openecomp.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_mgmt_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.capacity_vnfci: + type: org.openecomp.capabilities.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_vnfci: + type: org.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_mgmt_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + network.outgoing.bytes_mgmt_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_mgmt_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 + instance_vnfci: + type: org.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_mgmt_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.capabilities.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_vnfci: + type: org.openecomp.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_vnfci: + type: org.openecomp.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_mgmt_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_vnfci: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + memory_vnfci: + type: org.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_vnfci: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED + binding_vnfci: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + scalable_vnfci: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_vnfci: + type: org.openecomp.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_mgmt_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + vcpus_vnfci: + type: org.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_vnfci: + type: org.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_vnfci: type: tosca.capabilities.Container valid_source_types: @@ -144,23 +449,32 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_vnfci: - type: tosca.capabilities.network.Bindable + disk.device.allocation_vnfci: + type: org.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_boot_volume: - type: tosca.capabilities.Attachment + network.incoming.bytes.rate_mgmt_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - scalable_vnfci: - type: tosca.capabilities.Scalable + disk.read.requests_vnfci: + type: org.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_data_volume: - type: tosca.capabilities.Attachment + feature_boot_volume: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests.rate_vnfci: + type: org.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/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/MainServiceTemplate.yaml index b3b1349b36..ee856f8b00 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/MainServiceTemplate.yaml @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: Main imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml topology_template: inputs: vf_module_id: @@ -185,7 +161,7 @@ topology_template: vf_component: get_input: vf_component groups: - mvs.vfmodule.heat: + mvs.vfmodule.heat_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/mvs.vfmodule.heat.yaml diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml index 315318d4f6..85bd55e44b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: mvs.nested.heat imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml node_types: org.openecomp.resource.vfc.nodes.heat.vnfci: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server @@ -237,6 +213,12 @@ topology_template: mgmt_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: true security_groups: - get_input: sec_groups fixed_ips: @@ -245,6 +227,9 @@ topology_template: - get_input: indx - get_input: - get_input: mvs_mgmt_ip_0 + mac_requirements: + mac_count_required: + is_required: false allowed_address_pairs: - ip_address: get_input: virtual_mgmt_ip_0 @@ -265,6 +250,7 @@ topology_template: get_input: vf_component $VF_INSTANCE_NUM: get_input: vf_instance_num + network_role_tag: mgmt network: get_input: mgmt_net_id requirements: @@ -273,7 +259,7 @@ topology_template: node: vnfci relationship: tosca.relationships.network.BindsTo groups: - mvs.nested.heat: + mvs.nested.heat_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/mvs.nested.heat.yaml @@ -287,34 +273,190 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.mvs.nested.heat capabilities: + disk.ephemeral.size_vnfci: + - vnfci + - disk.ephemeral.size + disk.iops_vnfci: + - vnfci + - disk.iops + network.outgoing.bytes.rate_mgmt_port: + - mgmt_port + - network.outgoing.bytes.rate + disk.device.write.bytes_vnfci: + - vnfci + - disk.device.write.bytes + disk.device.iops_vnfci: + - vnfci + - disk.device.iops + cpu_util_vnfci: + - vnfci + - cpu_util + disk.write.bytes.rate_vnfci: + - vnfci + - disk.write.bytes.rate + disk.device.latency_vnfci: + - vnfci + - disk.device.latency + disk.latency_vnfci: + - vnfci + - disk.latency + disk.write.requests_vnfci: + - vnfci + - disk.write.requests + attachment_data_volume: + - data_volume + - attachment + network.outpoing.packets_mgmt_port: + - mgmt_port + - network.outpoing.packets + memory.resident_vnfci: + - vnfci + - memory.resident os_vnfci: - vnfci - os + memory.usage_vnfci: + - vnfci + - memory.usage attachment_mgmt_port: - mgmt_port - attachment + disk.device.write.bytes.rate_vnfci: + - vnfci + - disk.device.write.bytes.rate + attachment_boot_volume: + - boot_volume + - attachment + feature_data_volume: + - data_volume + - feature + disk.root.size_vnfci: + - vnfci + - disk.root.size + disk.device.usage_vnfci: + - vnfci + - disk.device.usage + disk.read.bytes_vnfci: + - vnfci + - disk.read.bytes + disk.device.read.bytes.rate_vnfci: + - vnfci + - disk.device.read.bytes.rate + disk.read.bytes.rate_vnfci: + - vnfci + - disk.read.bytes.rate + cpu_vnfci: + - vnfci + - cpu + disk.device.write.requests.rate_vnfci: + - vnfci + - disk.device.write.requests.rate + network.incoming.bytes_mgmt_port: + - mgmt_port + - network.incoming.bytes + disk.capacity_vnfci: + - vnfci + - disk.capacity + disk.device.read.requests_vnfci: + - vnfci + - disk.device.read.requests + binding_mgmt_port: + - mgmt_port + - binding + network.outgoing.bytes_mgmt_port: + - mgmt_port + - network.outgoing.bytes + network.incoming.packets_mgmt_port: + - mgmt_port + - network.incoming.packets + instance_vnfci: + - vnfci + - instance + feature_mgmt_port: + - mgmt_port + - feature + disk.device.read.bytes_vnfci: + - vnfci + - disk.device.read.bytes + disk.allocation_vnfci: + - vnfci + - disk.allocation + disk.write.requests.rate_vnfci: + - vnfci + - disk.write.requests.rate + disk.write.bytes_vnfci: + - vnfci + - disk.write.bytes + disk.device.write.requests_vnfci: + - vnfci + - disk.device.write.requests + disk.usage_vnfci: + - vnfci + - disk.usage + network.incoming.packets.rate_mgmt_port: + - mgmt_port + - network.incoming.packets.rate + feature_vnfci: + - vnfci + - feature + memory_vnfci: + - vnfci + - memory endpoint_vnfci: - vnfci - endpoint - host_vnfci: - - vnfci - - host binding_vnfci: - vnfci - binding - attachment_boot_volume: - - boot_volume - - attachment scalable_vnfci: - vnfci - scalable - attachment_data_volume: - - data_volume - - attachment + disk.device.capacity_vnfci: + - vnfci + - disk.device.capacity + network.outgoing.packets.rate_mgmt_port: + - mgmt_port + - network.outgoing.packets.rate + vcpus_vnfci: + - vnfci + - vcpus + cpu.delta_vnfci: + - vnfci + - cpu.delta + host_vnfci: + - vnfci + - host + disk.device.allocation_vnfci: + - vnfci + - disk.device.allocation + network.incoming.bytes.rate_mgmt_port: + - mgmt_port + - network.incoming.bytes.rate + disk.read.requests_vnfci: + - vnfci + - disk.read.requests + feature_boot_volume: + - boot_volume + - feature + disk.device.read.requests.rate_vnfci: + - vnfci + - disk.device.read.requests.rate requirements: + dependency_mgmt_port: + - mgmt_port + - dependency + dependency_vnfci: + - vnfci + - dependency local_storage_vnfci: - vnfci - local_storage + dependency_data_volume: + - data_volume + - dependency link_mgmt_port: - mgmt_port - - link
\ No newline at end of file + - link + dependency_boot_volume: + - boot_volume + - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index b99ba37305..9699fe0770 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -2,32 +2,8 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: GlobalSubstitutionTypes imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml +- openecomp_heat_index: + file: openecomp-heat/_index.yml node_types: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute @@ -35,54 +11,94 @@ node_types: availabilityzone_name: type: string description: availabilityzone name + required: true + status: SUPPORTED oam_net_gw: type: string description: CPS network gateway + required: true + status: SUPPORTED pcm_image_name: type: string description: PCRF CM image name + required: true + status: SUPPORTED security_group_name: type: string description: the name of security group + required: true + status: SUPPORTED cps_net_ip: type: string description: CPS network ip + required: true + status: SUPPORTED pcm_flavor_name: type: string description: flavor name of PCRF CM instance + required: true + status: SUPPORTED pcm_vol: type: string description: CPS Cluman Cinder Volume + required: true + status: SUPPORTED pcm_server_name: type: string description: PCRF CM server name + required: true + status: SUPPORTED cps_net_name: type: string description: CPS network name + required: true + status: SUPPORTED cps_net_mask: type: string description: CPS network mask + required: true + status: SUPPORTED oam_net_ip: type: string description: OAM network ip + required: true + status: SUPPORTED oam_net_mask: type: string description: CPS network mask + required: true + status: SUPPORTED oam_net_name: type: string description: OAM network name + required: true + status: SUPPORTED 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 - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_server_pcm: + 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 @@ -90,16 +106,163 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_pcm_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_pcm_port_0: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - endpoint_server_pcm: - type: tosca.capabilities.Endpoint.Admin + 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: + - 1 + - UNBOUNDED + cpu_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_pcm_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_pcm_port_1: + type: org.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: + type: org.openecomp.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: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.resident_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.usage_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.allocation_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.usage_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.root.size_server_pcm: + type: org.openecomp.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: + type: org.openecomp.capabilities.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: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_pcm_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.requests_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.capacity_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -108,6 +271,132 @@ node_types: occurrences: - 1 - UNBOUNDED + disk.read.bytes_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + 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 + 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 + feature_pcm_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_pcm_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_pcm_port_0: + type: tosca.capabilities.Node + occurrences: + - 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. + occurrences: + - 1 + - UNBOUNDED + attachment_pcm_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + attachment_pcm_port_1: + 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: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + vcpus_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes.rate_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.allocation_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + scalable_server_pcm: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes.rate_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_util_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + 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 + 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 host_server_pcm: type: tosca.capabilities.Container valid_source_types: @@ -115,8 +404,21 @@ node_types: occurrences: - 1 - UNBOUNDED - scalable_server_pcm: - type: tosca.capabilities.Scalable + cpu.delta_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_pcm_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pcm_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -125,13 +427,68 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pcm_port_0: - type: tosca.capabilities.Attachment + network.outgoing.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. occurrences: - 1 - UNBOUNDED - attachment_pcm_port_1: - type: tosca.capabilities.Attachment + 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: + - 1 + - UNBOUNDED + network.incoming.packets_pcm_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + 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. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests.rate_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.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 + disk.device.read.requests_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_server_pcm: + type: tosca.capabilities.Node + 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. + occurrences: + - 1 + - UNBOUNDED + 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: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pcm_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/MainServiceTemplate.yaml index ed5854c2fd..90dcdb5d5f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/MainServiceTemplate.yaml @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: Main imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml topology_template: inputs: oam_net_ips: @@ -128,6 +104,10 @@ topology_template: get_input: pcm_flavor_name service_template_filter: substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml + metadata: + get_attribute: + - server_pcm_001 + - server_pcm_id availabilityzone_name: get_input: availabilityzone_name pcm_image_name: @@ -153,6 +133,10 @@ topology_template: get_input: availabilityzone_name oam_net_gw: get_input: oam_net_gw + user_data_format: + get_attribute: + - server_pcm_002 + - pcm_vol pcm_vol: get_input: - pcm_volumes @@ -175,6 +159,16 @@ topology_template: get_input: oam_net_mask oam_net_name: get_input: oam_net_name + packet_mirror_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: cps_net_name + requirements: + - dependency: + capability: tosca.capabilities.Node + node: server_pcm_001 + relationship: tosca.relationships.DependsOn server_pcm_003: type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1 directives: @@ -199,18 +193,30 @@ topology_template: cps_net_mask: get_input: cps_net_mask groups: - hot-nimbus-pcm_v0.4_2: + hot-nimbus-pcm_v0.4_group: type: org.openecomp.groups.heat.HeatStack properties: - heat_file: ../Artifacts/hot-nimbus-pcm_v0.4_2.yaml + heat_file: ../Artifacts/hot-nimbus-pcm_v0.4.yaml description: heat template that creates PCRF Cluman stack members: - - server_pcm_003 - hot-nimbus-pcm_v0.4: + - server_pcm_002 + - server_pcm_001 + - packet_mirror_network + hot-nimbus-pcm_v0.4_2_group: type: org.openecomp.groups.heat.HeatStack properties: - heat_file: ../Artifacts/hot-nimbus-pcm_v0.4.yaml + heat_file: ../Artifacts/hot-nimbus-pcm_v0.4_2.yaml description: heat template that creates PCRF Cluman stack members: - - server_pcm_002 - - server_pcm_001
\ No newline at end of file + - server_pcm_003 + outputs: + output_attr_1: + value: + get_attribute: + - server_pcm_001 + - pcm_vol + output_attr_2: + value: + get_attribute: + - server_pcm_002 + - oam_net_ip
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml index 1b03021742..f0fffa18ed 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: nested-pcm_v0.1 imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml node_types: org.openecomp.resource.vfc.nodes.heat.pcm_server: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server @@ -117,11 +93,21 @@ topology_template: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: - ip_address: get_input: oam_net_ip + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -138,18 +124,28 @@ topology_template: get_input: availabilityzone_name image: get_input: pcm_image_name - config_drive: 'True' + config_drive: true user_data_format: RAW name: get_input: pcm_server_name pcm_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: - ip_address: get_input: cps_net_ip + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: cps network: get_input: cps_net_name requirements: @@ -158,7 +154,7 @@ topology_template: node: server_pcm relationship: tosca.relationships.network.BindsTo groups: - nested-pcm_v0.1: + nested-pcm_v0.1_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/nested-pcm_v0.1.yaml @@ -174,27 +170,195 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1 capabilities: - endpoint_server_pcm: + network.incoming.packets.rate_pcm_port_0: + - pcm_port_0 + - network.incoming.packets.rate + cpu_server_pcm: - server_pcm - - endpoint + - 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 + 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 + 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 - host_server_pcm: + disk.read.bytes_server_pcm: - server_pcm - - host + - 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 + endpoint_server_pcm: + - server_pcm + - 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 + 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 + - 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 - attachment_pcm_port_0: + network.outgoing.bytes.rate_pcm_port_0: - pcm_port_0 - - attachment - attachment_pcm_port_1: + - network.outgoing.bytes.rate + disk.device.capacity_server_pcm: + - server_pcm + - disk.device.capacity + network.incoming.packets_pcm_port_1: - pcm_port_1 - - attachment + - 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.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.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 @@ -204,4 +368,13 @@ topology_template: - link local_storage_server_pcm: - server_pcm - - local_storage
\ No newline at end of file + - local_storage + dependency_pcm_port_0: + - pcm_port_0 + - dependency + dependency_server_pcm: + - server_pcm + - dependency + dependency_pcm_port_1: + - pcm_port_1 + - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/inputs/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/inputs/MANIFEST.json index 6f151c4f36..67fe95690d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/inputs/MANIFEST.json +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/inputs/MANIFEST.json @@ -11,11 +11,13 @@ "file": "hot-nimbus-pcm_v0.4.env", "type": "HEAT_ENV" } - ] - },{ + ] + }, + { "file": "nested-pcm_v0.1.yaml", "type": "HEAT" - },{ + }, + { "file": "hot-nimbus-pcm_v0.4_2.yaml", "type": "HEAT" } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/inputs/hot-nimbus-pcm_v0.4.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/inputs/hot-nimbus-pcm_v0.4.yaml index f7d050790f..aa67fcd567 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/inputs/hot-nimbus-pcm_v0.4.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/inputs/hot-nimbus-pcm_v0.4.yaml @@ -70,6 +70,7 @@ resources: oam_net_ip: { get_param: [oam_net_ips, 0] } oam_net_mask: { get_param: oam_net_mask } oam_net_gw: { get_param: oam_net_gw } + user_data_format: { get_attr: [server_pcm_002 , pcm_vol] } server_pcm_002: type: nested-pcm_v0.1.yaml @@ -80,3 +81,19 @@ resources: availabilityzone_name: { get_param: availabilityzone_name } security_group_name: { get_param: security_group_name } pcm_vol: { get_param: [pcm_volumes, 0] } + metadata: { get_attr: [server_pcm_001]} + + packet_mirror_network: + type: OS::Neutron::Net + depends_on: + - server_pcm_001 + properties: + name: + get_param: cps_net_name + +outputs: + output_attr_1: + value: {get_attr: [server_pcm_001 , pcm_vol] } + + output_attr_2: + value: {get_attr: [server_pcm_002 , oam_net_ip] } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index b99ba37305..9699fe0770 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -2,32 +2,8 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: GlobalSubstitutionTypes imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml +- openecomp_heat_index: + file: openecomp-heat/_index.yml node_types: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute @@ -35,54 +11,94 @@ node_types: availabilityzone_name: type: string description: availabilityzone name + required: true + status: SUPPORTED oam_net_gw: type: string description: CPS network gateway + required: true + status: SUPPORTED pcm_image_name: type: string description: PCRF CM image name + required: true + status: SUPPORTED security_group_name: type: string description: the name of security group + required: true + status: SUPPORTED cps_net_ip: type: string description: CPS network ip + required: true + status: SUPPORTED pcm_flavor_name: type: string description: flavor name of PCRF CM instance + required: true + status: SUPPORTED pcm_vol: type: string description: CPS Cluman Cinder Volume + required: true + status: SUPPORTED pcm_server_name: type: string description: PCRF CM server name + required: true + status: SUPPORTED cps_net_name: type: string description: CPS network name + required: true + status: SUPPORTED cps_net_mask: type: string description: CPS network mask + required: true + status: SUPPORTED oam_net_ip: type: string description: OAM network ip + required: true + status: SUPPORTED oam_net_mask: type: string description: CPS network mask + required: true + status: SUPPORTED oam_net_name: type: string description: OAM network name + required: true + status: SUPPORTED 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 - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_server_pcm: + 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 @@ -90,16 +106,163 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_pcm_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_pcm_port_0: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - endpoint_server_pcm: - type: tosca.capabilities.Endpoint.Admin + 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: + - 1 + - UNBOUNDED + cpu_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_pcm_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_pcm_port_1: + type: org.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: + type: org.openecomp.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: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.resident_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.usage_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.allocation_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.usage_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.root.size_server_pcm: + type: org.openecomp.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: + type: org.openecomp.capabilities.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: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_pcm_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.requests_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.capacity_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -108,6 +271,132 @@ node_types: occurrences: - 1 - UNBOUNDED + disk.read.bytes_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + 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 + 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 + feature_pcm_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_pcm_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_pcm_port_0: + type: tosca.capabilities.Node + occurrences: + - 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. + occurrences: + - 1 + - UNBOUNDED + attachment_pcm_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + attachment_pcm_port_1: + 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: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + vcpus_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes.rate_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.allocation_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + scalable_server_pcm: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes.rate_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_util_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + 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 + 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 host_server_pcm: type: tosca.capabilities.Container valid_source_types: @@ -115,8 +404,21 @@ node_types: occurrences: - 1 - UNBOUNDED - scalable_server_pcm: - type: tosca.capabilities.Scalable + cpu.delta_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_pcm_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pcm_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -125,13 +427,68 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pcm_port_0: - type: tosca.capabilities.Attachment + network.outgoing.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. occurrences: - 1 - UNBOUNDED - attachment_pcm_port_1: - type: tosca.capabilities.Attachment + 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: + - 1 + - UNBOUNDED + network.incoming.packets_pcm_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + 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. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests.rate_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.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 + disk.device.read.requests_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_server_pcm: + type: tosca.capabilities.Node + 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. + occurrences: + - 1 + - UNBOUNDED + 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: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pcm_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/MainServiceTemplate.yaml index dcc2a9abbb..aba8c1aa81 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/MainServiceTemplate.yaml @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: Main imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml node_types: org.openecomp.resource.vfc.nodes.heat.compute: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server @@ -188,9 +164,28 @@ topology_template: get_input: oam_net_mask oam_net_name: get_input: oam_net_name + packet_mirror_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: net_name + requirements: + - dependency: + capability: tosca.capabilities.Node + node: server_pcm_001 + relationship: tosca.relationships.DependsOn compute_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + mac_requirements: + mac_count_required: + is_required: false network: get_input: net_name server_compute_get_attr_test: @@ -200,6 +195,10 @@ topology_template: compute_flavor_name: null image: get_input: compute_image_name + metadata: + get_attribute: + - server_pcm_001 + - server_pcm_id config_drive: get_attribute: - compute_port_0 @@ -225,12 +224,19 @@ topology_template: name: compute_name: null groups: - hot-nimbus-pcm_v0.4: + hot-nimbus-pcm_v0.4_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/hot-nimbus-pcm_v0.4.yaml description: heat template that creates PCRF Cluman stack members: - server_pcm_001 + - packet_mirror_network - compute_port_0 - - server_compute_get_attr_test
\ No newline at end of file + - server_compute_get_attr_test + outputs: + output_attr_1: + value: + get_attribute: + - server_pcm_001 + - pcm_vol diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml index 1b03021742..f0fffa18ed 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: nested-pcm_v0.1 imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml node_types: org.openecomp.resource.vfc.nodes.heat.pcm_server: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server @@ -117,11 +93,21 @@ topology_template: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: - ip_address: get_input: oam_net_ip + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -138,18 +124,28 @@ topology_template: get_input: availabilityzone_name image: get_input: pcm_image_name - config_drive: 'True' + config_drive: true user_data_format: RAW name: get_input: pcm_server_name pcm_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: - ip_address: get_input: cps_net_ip + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: cps network: get_input: cps_net_name requirements: @@ -158,7 +154,7 @@ topology_template: node: server_pcm relationship: tosca.relationships.network.BindsTo groups: - nested-pcm_v0.1: + nested-pcm_v0.1_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/nested-pcm_v0.1.yaml @@ -174,27 +170,195 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1 capabilities: - endpoint_server_pcm: + network.incoming.packets.rate_pcm_port_0: + - pcm_port_0 + - network.incoming.packets.rate + cpu_server_pcm: - server_pcm - - endpoint + - 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 + 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 + 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 - host_server_pcm: + disk.read.bytes_server_pcm: - server_pcm - - host + - 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 + endpoint_server_pcm: + - server_pcm + - 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 + 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 + - 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 - attachment_pcm_port_0: + network.outgoing.bytes.rate_pcm_port_0: - pcm_port_0 - - attachment - attachment_pcm_port_1: + - network.outgoing.bytes.rate + disk.device.capacity_server_pcm: + - server_pcm + - disk.device.capacity + network.incoming.packets_pcm_port_1: - pcm_port_1 - - attachment + - 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.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.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 @@ -204,4 +368,13 @@ topology_template: - link local_storage_server_pcm: - server_pcm - - local_storage
\ No newline at end of file + - local_storage + dependency_pcm_port_0: + - pcm_port_0 + - dependency + dependency_server_pcm: + - server_pcm + - dependency + dependency_pcm_port_1: + - pcm_port_1 + - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/inputs/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/inputs/MANIFEST.json index 345ca77b2a..609c38b28e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/inputs/MANIFEST.json +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/inputs/MANIFEST.json @@ -11,8 +11,9 @@ "file": "hot-nimbus-pcm_v0.4.env", "type": "HEAT_ENV" } - ] - },{ + ] + }, + { "file": "nested-pcm_v0.1.yaml", "type": "HEAT" } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/inputs/hot-nimbus-pcm_v0.4.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/inputs/hot-nimbus-pcm_v0.4.yaml index e4a79f34ba..22b14cf018 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/inputs/hot-nimbus-pcm_v0.4.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/inputs/hot-nimbus-pcm_v0.4.yaml @@ -86,9 +86,21 @@ resources: image: { get_param: compute_image_name } flavor: { compute_flavor_name } user_data_format: { get_attr: [server_pcm_001 , oam_net_gw] } - user_data: { get_attr: [server_pcm_001]} + metadata: { get_attr: [server_pcm_001]} compute_port_0: type: OS::Neutron::Port properties: - network: { get_param: net_name }
\ No newline at end of file + network: { get_param: net_name } + + packet_mirror_network: + type: OS::Neutron::Net + depends_on: + - server_pcm_001 + properties: + name: + get_param: net_name + +outputs: + output_attr_1: + value: {get_attr: [server_pcm_001 , pcm_vol] } |