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 | 418 +++++++++++++++++++-- .../expectedoutputfiles/MainServiceTemplate.yaml | 44 +-- .../expectedoutputfiles/nestedServiceTemplate.yaml | 245 ++++++++++-- 3 files changed, 600 insertions(+), 107 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityruletosharedportresourcegrouplinking/expectedoutputfiles') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityruletosharedportresourcegrouplinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityruletosharedportresourcegrouplinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 267fa61cd4..6270231f88 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityruletosharedportresourcegrouplinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityruletosharedportresourcegrouplinking/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,36 +11,65 @@ node_types: cmaui_names: type: list description: CMAUI1, CMAUI2 server names + required: true + status: SUPPORTED entry_schema: type: string p1: type: string description: UID of OAM network + required: true + status: SUPPORTED 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 + required: true + status: SUPPORTED net: 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_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 @@ -72,14 +77,89 @@ 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 + 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 + 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 + 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 host_server_cmaui: type: tosca.capabilities.Container valid_source_types: @@ -87,33 +167,299 @@ 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 + attachment_cmaui_port_2: + type: tosca.capabilities.Attachment + 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 + 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 + 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.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_cmaui_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.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 + 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: + type: org.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 + 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_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 + 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 + 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 + 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.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 + 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 + 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 + 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 + 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.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 + 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.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.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 + 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 endpoint_server_cmaui: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - binding_server_cmaui: - type: tosca.capabilities.network.Bindable + 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 - attachment_cmaui_port_2: - type: tosca.capabilities.Attachment + 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 - scalable_server_cmaui: - type: tosca.capabilities.Scalable + 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 - attachment_cmaui_port_1: - type: tosca.capabilities.Attachment + 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 \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityruletosharedportresourcegrouplinking/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityruletosharedportresourcegrouplinking/expectedoutputfiles/MainServiceTemplate.yaml index 9466ebff85..a7a2b36685 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityruletosharedportresourcegrouplinking/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityruletosharedportresourcegrouplinking/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: @@ -224,20 +200,20 @@ topology_template: node: mvs_modules relationship: org.openecomp.relationships.AttachesTo groups: - addOn: + main_group: type: org.openecomp.groups.heat.HeatStack properties: - heat_file: ../Artifacts/addOn.yml + heat_file: ../Artifacts/main.yml description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - mvs_modules - main: + - jsa_security_group1 + - jsa_security_group2 + addOn_group: type: org.openecomp.groups.heat.HeatStack properties: - heat_file: ../Artifacts/main.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 + - mvs_modules \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityruletosharedportresourcegrouplinking/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityruletosharedportresourcegrouplinking/expectedoutputfiles/nestedServiceTemplate.yaml index 729e969c0c..e3a89fd3a3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityruletosharedportresourcegrouplinking/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityruletosharedportresourcegrouplinking/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 @@ -82,6 +58,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: p1 fixed_ips: @@ -89,6 +71,9 @@ topology_template: get_input: - cmaui_oam_ips - 0 + mac_requirements: + mac_count_required: + is_required: false network: get_input: net requirements: @@ -113,6 +98,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: p1 - get_input: p2 @@ -121,6 +112,9 @@ topology_template: get_input: - cmaui_oam_ips - 0 + mac_requirements: + mac_count_required: + is_required: false network: get_input: net requirements: @@ -129,7 +123,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 @@ -141,34 +135,211 @@ 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 + disk.device.allocation_server_cmaui: + - server_cmaui + - disk.device.allocation + scalable_server_cmaui: + - server_cmaui + - scalable + disk.read.bytes.rate_server_cmaui: + - server_cmaui + - disk.read.bytes.rate + 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 host_server_cmaui: - server_cmaui - host + cpu_util_server_cmaui: + - server_cmaui + - cpu_util + attachment_cmaui_port_2: + - cmaui_port_2 + - attachment + 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 + network.outgoing.bytes_cmaui_port_2: + - cmaui_port_2 + - network.outgoing.bytes + 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.usage_server_cmaui: + - server_cmaui + - disk.usage + network.outgoing.bytes_cmaui_port_1: + - cmaui_port_1 + - network.outgoing.bytes + disk.device.usage_server_cmaui: + - server_cmaui + - disk.device.usage + attachment_cmaui_port_1: + - cmaui_port_1 + - attachment + disk.capacity_server_cmaui: + - server_cmaui + - disk.capacity + disk.write.requests.rate_server_cmaui: + - server_cmaui + - disk.write.requests.rate + disk.device.read.requests_server_cmaui: + - server_cmaui + - disk.device.read.requests + instance_server_cmaui: + - server_cmaui + - instance + disk.device.read.bytes_server_cmaui: + - server_cmaui + - disk.device.read.bytes + memory_server_cmaui: + - server_cmaui + - memory + disk.root.size_server_cmaui: + - server_cmaui + - disk.root.size + binding_server_cmaui: + - server_cmaui + - binding + disk.device.read.requests.rate_server_cmaui: + - server_cmaui + - disk.device.read.requests.rate + network.incoming.packets_cmaui_port_2: + - cmaui_port_2 + - network.incoming.packets + disk.write.bytes_server_cmaui: + - server_cmaui + - disk.write.bytes os_server_cmaui: - server_cmaui - os + disk.device.write.bytes.rate_server_cmaui: + - server_cmaui + - disk.device.write.bytes.rate + network.incoming.packets_cmaui_port_1: + - cmaui_port_1 + - network.incoming.packets + memory.resident_server_cmaui: + - server_cmaui + - memory.resident + disk.latency_server_cmaui: + - server_cmaui + - disk.latency + feature_server_cmaui: + - server_cmaui + - feature + binding_cmaui_port_1: + - cmaui_port_1 + - binding + binding_cmaui_port_2: + - cmaui_port_2 + - binding + vcpus_server_cmaui: + - server_cmaui + - vcpus + 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.allocation_server_cmaui: + - server_cmaui + - disk.allocation + disk.write.requests_server_cmaui: + - server_cmaui + - disk.write.requests + memory.usage_server_cmaui: + - server_cmaui + - memory.usage + disk.ephemeral.size_server_cmaui: + - server_cmaui + - disk.ephemeral.size + 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.outgoing.bytes.rate_cmaui_port_2: + - cmaui_port_2 + - network.outgoing.bytes.rate + network.outgoing.bytes.rate_cmaui_port_1: + - cmaui_port_1 + - network.outgoing.bytes.rate endpoint_server_cmaui: - server_cmaui - endpoint - binding_server_cmaui: + disk.iops_server_cmaui: - server_cmaui - - binding - attachment_cmaui_port_2: + - disk.iops + disk.device.iops_server_cmaui: + - server_cmaui + - disk.device.iops + network.incoming.bytes_cmaui_port_2: - cmaui_port_2 - - attachment - scalable_server_cmaui: + - network.incoming.bytes + disk.read.bytes_server_cmaui: - server_cmaui - - scalable - attachment_cmaui_port_1: + - disk.read.bytes + network.incoming.bytes_cmaui_port_1: - cmaui_port_1 - - attachment + - network.incoming.bytes requirements: + dependency_server_cmaui: + - server_cmaui + - dependency local_storage_server_cmaui: - server_cmaui - local_storage + dependency_cmaui_port_1: + - cmaui_port_1 + - dependency link_cmaui_port_2: - cmaui_port_2 - link link_cmaui_port_1: - cmaui_port_1 - - link \ No newline at end of file + - link + dependency_cmaui_port_2: + - cmaui_port_2 + - dependency \ No newline at end of file -- cgit 1.2.3-korg