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