From 280f8015d06af1f41a3ef12e8300801c7a5e0d54 Mon Sep 17 00:00:00 2001 From: AviZi Date: Fri, 9 Jun 2017 02:39:56 +0300 Subject: [SDC-29] Amdocs OnBoard 1707 initial commit. Change-Id: Ie4d12a3f574008b792899b368a0902a8b46b5370 Signed-off-by: AviZi --- .../GlobalSubstitutionTypesServiceTemplate.yaml | 428 +++++++++++++++++++-- .../expectedoutputfiles/MainServiceTemplate.yaml | 38 +- .../dns_nested_01ServiceTemplate.yaml | 239 ++++++++++-- 3 files changed, 609 insertions(+), 96 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles') 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 -- cgit 1.2.3-korg