diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared')
4 files changed, 1541 insertions, 166 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 351b12fd58..5163613c02 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/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.nested1: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute @@ -35,48 +11,85 @@ 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 abc_flavor: type: string description: Flavor for CMAUI server + 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 abc_names: type: list description: CMAUI1, CMAUI2 server names + required: true + status: SUPPORTED entry_schema: type: string security_group_name: description: not impotrtant + required: true + status: SUPPORTED availability_zone_0: type: string description: availabilityzone name + required: true + status: SUPPORTED abc_oam_ips: type: string + required: true + status: SUPPORTED cmaui_oam_ips: type: string + required: true + status: SUPPORTED abc_image: type: string description: Image for CMAUI server + 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 @@ -84,6 +97,13 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_server_abc: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - local_storage_server_abc: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage @@ -91,33 +111,60 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_abc_port_1: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_abc_port_1: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - 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: - scalable_server_abc: - type: tosca.capabilities.Scalable + 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 - os_server_cmaui: - type: tosca.capabilities.OperatingSystem + disk.device.write.requests.rate_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_abc_port_1: - type: tosca.capabilities.Attachment + disk.write.bytes.rate_server_abc: + type: org.openecomp.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 + memory.resident_server_abc: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -126,10 +173,9 @@ node_types: occurrences: - 1 - UNBOUNDED - host_server_abc: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + 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 @@ -138,6 +184,24 @@ node_types: occurrences: - 1 - UNBOUNDED + cpu_server_abc: + type: org.openecomp.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_abc_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_abc: + type: org.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: @@ -145,18 +209,133 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_server_abc: + cpu_util_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_abc_port_1: type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.device.write.requests_server_abc: + type: org.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 + 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 - binding_server_cmaui: - type: tosca.capabilities.network.Bindable + network.outgoing.bytes_cmaui_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_cmaui_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_abc_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.write.requests_server_abc: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + instance_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.root.size_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.capacity_server_abc: + type: org.openecomp.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_abc: + type: org.openecomp.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 + os_server_cmaui: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes.rate_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes.rate_server_abc: + type: org.openecomp.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_abc: + type: org.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_abc_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_cmaui_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes_server_abc: + type: org.openecomp.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_abc_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 @@ -165,43 +344,529 @@ node_types: occurrences: - 1 - UNBOUNDED + disk.write.requests.rate_server_abc: + type: org.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 + instance_server_abc: + type: org.openecomp.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_abc_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.usage_server_cmaui: + type: org.openecomp.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_abc: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.ephemeral.size_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_cmaui_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_cmaui_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.iops_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.iops_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_cmaui_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_cmaui_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.allocation_server_abc: + type: org.openecomp.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_abc: + type: org.openecomp.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 + network.incoming.packets_abc_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_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.read.requests_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + 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 + 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.root.size_server_abc: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.capacity_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.requests.rate_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.latency_server_abc: + type: org.openecomp.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 + memory_server_abc: + type: org.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.device.read.bytes_server_abc: + type: org.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 + memory.usage_server_abc: + type: org.openecomp.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_abc: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests.rate_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.usage_server_abc: + type: org.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_abc: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes_server_abc: + type: org.openecomp.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_abc: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests.rate_server_abc: + type: org.openecomp.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_abc_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_abc_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.ephemeral.size_server_abc: + type: org.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_abc: + type: org.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_abc: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_server_abc: + type: org.openecomp.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_abc_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_abc_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.device.allocation_server_abc: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.latency_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + vcpus_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + 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 + disk.device.write.requests.rate_server_abc: + type: org.openecomp.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_abc: + type: org.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_abc: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent + 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 + endpoint_server_cmaui: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + cpu.delta_server_abc: + type: org.openecomp.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_abc: + type: org.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_abc: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + vcpus_server_abc: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED org.openecomp.resource.abstract.nodes.heat.nested2: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute properties: cmaui_names: type: list description: CMAUI1, CMAUI2 server names + required: true + status: SUPPORTED entry_schema: type: string p1: 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 security_group_name: description: not impotrtant + required: true + status: SUPPORTED availability_zone_0: type: string description: availabilityzone name + required: true + status: SUPPORTED abc_oam_ips: type: string + required: true + status: SUPPORTED cmaui_oam_ips: type: string + required: true + status: SUPPORTED requirements: + - 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 @@ -209,14 +874,78 @@ 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 + 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 + 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: @@ -224,28 +953,245 @@ 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 + disk.device.latency_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.requests_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + 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 + 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 + 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 + 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 + 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.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 - scalable_server_cmaui: - type: tosca.capabilities.Scalable + 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 - 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/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/MainServiceTemplate.yaml index 427e7be436..4f0f52d340 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/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: left_vn_fqdn: @@ -312,23 +288,23 @@ topology_template: node: test_net1 relationship: tosca.relationships.network.LinksTo 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: - - test_nested2 - - test_nested3 - - test_nested1 - main: + - template_NetworkPolicy + - test_net2 + - test_net1 + 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: - - template_NetworkPolicy - - test_net2 - - test_net1
\ No newline at end of file + - test_nested2 + - test_nested3 + - test_nested1
\ 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/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml index cd5b767492..15e635979b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: nested1 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.abc: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server @@ -104,6 +80,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: security_group_name fixed_ips: @@ -111,6 +93,9 @@ topology_template: get_input: - cmaui_oam_ips - 0 + mac_requirements: + mac_count_required: + is_required: false network: get_input: p2 requirements: @@ -148,6 +133,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: security_group_name fixed_ips: @@ -155,6 +146,9 @@ topology_template: get_input: - abc_oam_ips - 0 + mac_requirements: + mac_count_required: + is_required: false network: get_input: p2 requirements: @@ -166,6 +160,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: security_group_name fixed_ips: @@ -173,6 +173,9 @@ topology_template: get_input: - cmaui_oam_ips - 0 + mac_requirements: + mac_count_required: + is_required: false network: get_input: p1 requirements: @@ -181,7 +184,7 @@ topology_template: node: server_cmaui relationship: tosca.relationships.network.BindsTo groups: - nested1: + nested1_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/nested1.yml @@ -195,49 +198,367 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested1 capabilities: - scalable_server_abc: + cpu.delta_server_cmaui: + - server_cmaui + - cpu.delta + disk.device.write.requests.rate_server_cmaui: + - server_cmaui + - disk.device.write.requests.rate + disk.write.bytes.rate_server_abc: - server_abc - - scalable - os_server_cmaui: + - disk.write.bytes.rate + disk.device.allocation_server_cmaui: - server_cmaui - - os - attachment_abc_port_1: - - abc_port_1 - - attachment + - disk.device.allocation + memory.resident_server_abc: + - server_abc + - memory.resident scalable_server_cmaui: - server_cmaui - scalable - host_server_abc: - - server_abc - - host + disk.read.bytes.rate_server_cmaui: + - server_cmaui + - disk.read.bytes.rate os_server_abc: - server_abc - os + cpu_server_abc: + - server_abc + - cpu + network.outgoing.packets.rate_abc_port_1: + - abc_port_1 + - network.outgoing.packets.rate + disk.device.usage_server_abc: + - server_abc + - disk.device.usage host_server_cmaui: - server_cmaui - host - binding_server_abc: - - server_abc + cpu_util_server_cmaui: + - server_cmaui + - cpu_util + binding_abc_port_1: + - abc_port_1 - binding - endpoint_server_cmaui: + disk.device.write.requests_server_abc: + - server_abc + - disk.device.write.requests + disk.device.write.requests_server_cmaui: - server_cmaui - - endpoint - binding_server_cmaui: + - disk.device.write.requests + network.outgoing.bytes_cmaui_port_2: + - cmaui_port_2 + - network.outgoing.bytes + network.outgoing.bytes_cmaui_port_1: + - cmaui_port_1 + - network.outgoing.bytes + feature_abc_port_1: + - abc_port_1 + - feature + disk.write.requests_server_abc: + - server_abc + - disk.write.requests + instance_server_cmaui: - server_cmaui - - binding + - instance + disk.device.read.bytes_server_cmaui: + - server_cmaui + - disk.device.read.bytes + disk.root.size_server_cmaui: + - server_cmaui + - disk.root.size + disk.capacity_server_abc: + - server_abc + - disk.capacity + disk.device.write.bytes_server_abc: + - server_abc + - disk.device.write.bytes + network.incoming.packets_cmaui_port_2: + - cmaui_port_2 + - network.incoming.packets + os_server_cmaui: + - server_cmaui + - os + disk.device.write.bytes.rate_server_cmaui: + - server_cmaui + - disk.device.write.bytes.rate + disk.device.read.bytes.rate_server_abc: + - server_abc + - disk.device.read.bytes.rate + disk.iops_server_abc: + - server_abc + - disk.iops + attachment_abc_port_1: + - abc_port_1 + - attachment + network.incoming.packets_cmaui_port_1: + - cmaui_port_1 + - network.incoming.packets + disk.read.bytes_server_abc: + - server_abc + - disk.read.bytes + network.outpoing.packets_abc_port_1: + - abc_port_1 + - network.outpoing.packets endpoint_server_abc: - server_abc - endpoint + disk.write.requests.rate_server_abc: + - server_abc + - disk.write.requests.rate + feature_server_cmaui: + - server_cmaui + - feature + binding_cmaui_port_1: + - cmaui_port_1 + - binding + binding_cmaui_port_2: + - cmaui_port_2 + - binding + instance_server_abc: + - server_abc + - instance + network.incoming.packets.rate_abc_port_1: + - abc_port_1 + - network.incoming.packets.rate + memory.usage_server_cmaui: + - server_cmaui + - memory.usage + disk.device.write.bytes.rate_server_abc: + - server_abc + - disk.device.write.bytes.rate + disk.ephemeral.size_server_cmaui: + - server_cmaui + - disk.ephemeral.size + 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 + disk.iops_server_cmaui: + - server_cmaui + - disk.iops + disk.device.iops_server_cmaui: + - server_cmaui + - disk.device.iops + network.incoming.bytes_cmaui_port_2: + - cmaui_port_2 + - network.incoming.bytes + disk.read.bytes_server_cmaui: + - server_cmaui + - disk.read.bytes + network.incoming.bytes_cmaui_port_1: + - cmaui_port_1 + - network.incoming.bytes + disk.allocation_server_abc: + - server_abc + - disk.allocation + disk.device.iops_server_abc: + - server_abc + - disk.device.iops + 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 + network.incoming.packets_abc_port_1: + - abc_port_1 + - network.incoming.packets attachment_cmaui_port_2: - cmaui_port_2 - attachment + disk.device.latency_server_cmaui: + - server_cmaui + - disk.device.latency + disk.read.requests_server_cmaui: + - server_cmaui + - disk.read.requests + disk.device.capacity_server_cmaui: + - server_cmaui + - disk.device.capacity + 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 + disk.device.usage_server_cmaui: + - server_cmaui + - disk.device.usage attachment_cmaui_port_1: - cmaui_port_1 - attachment + disk.root.size_server_abc: + - server_abc + - disk.root.size + disk.capacity_server_cmaui: + - server_cmaui + - disk.capacity + disk.write.requests.rate_server_cmaui: + - server_cmaui + - disk.write.requests.rate + disk.device.latency_server_abc: + - server_abc + - disk.device.latency + disk.device.read.requests_server_cmaui: + - server_cmaui + - disk.device.read.requests + memory_server_abc: + - server_abc + - memory + memory_server_cmaui: + - server_cmaui + - memory + disk.device.read.bytes_server_abc: + - server_abc + - disk.device.read.bytes + binding_server_cmaui: + - server_cmaui + - binding + memory.usage_server_abc: + - server_abc + - memory.usage + disk.read.requests_server_abc: + - server_abc + - disk.read.requests + disk.device.read.requests.rate_server_cmaui: + - server_cmaui + - disk.device.read.requests.rate + disk.usage_server_abc: + - server_abc + - disk.usage + scalable_server_abc: + - server_abc + - scalable + disk.write.bytes_server_cmaui: + - server_cmaui + - disk.write.bytes + disk.write.bytes_server_abc: + - server_abc + - disk.write.bytes + disk.read.bytes.rate_server_abc: + - server_abc + - disk.read.bytes.rate + disk.device.read.requests.rate_server_abc: + - server_abc + - disk.device.read.requests.rate + network.outgoing.bytes_abc_port_1: + - abc_port_1 + - network.outgoing.bytes + network.incoming.bytes.rate_abc_port_1: + - abc_port_1 + - network.incoming.bytes.rate + disk.ephemeral.size_server_abc: + - server_abc + - disk.ephemeral.size + cpu_util_server_abc: + - server_abc + - cpu_util + binding_server_abc: + - server_abc + - binding + disk.device.capacity_server_abc: + - server_abc + - disk.device.capacity + network.outgoing.bytes.rate_abc_port_1: + - abc_port_1 + - network.outgoing.bytes.rate + network.incoming.bytes_abc_port_1: + - abc_port_1 + - network.incoming.bytes + memory.resident_server_cmaui: + - server_cmaui + - memory.resident + disk.device.allocation_server_abc: + - server_abc + - disk.device.allocation + disk.latency_server_cmaui: + - server_cmaui + - disk.latency + vcpus_server_cmaui: + - server_cmaui + - vcpus + disk.device.write.bytes_server_cmaui: + - server_cmaui + - disk.device.write.bytes + 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 + disk.device.write.requests.rate_server_abc: + - server_abc + - disk.device.write.requests.rate + disk.device.read.requests_server_abc: + - server_abc + - disk.device.read.requests + host_server_abc: + - server_abc + - host + network.outpoing.packets_cmaui_port_1: + - cmaui_port_1 + - network.outpoing.packets + network.outpoing.packets_cmaui_port_2: + - cmaui_port_2 + - network.outpoing.packets + endpoint_server_cmaui: + - server_cmaui + - endpoint + cpu.delta_server_abc: + - server_abc + - cpu.delta + disk.latency_server_abc: + - server_abc + - disk.latency + feature_server_abc: + - server_abc + - feature + vcpus_server_abc: + - server_abc + - vcpus requirements: + dependency_abc_port_1: + - abc_port_1 + - dependency + dependency_server_abc: + - server_abc + - dependency + dependency_server_cmaui: + - server_cmaui + - dependency local_storage_server_cmaui: - server_cmaui - local_storage + dependency_cmaui_port_1: + - cmaui_port_1 + - dependency link_abc_port_1: - abc_port_1 - link @@ -247,6 +568,9 @@ topology_template: link_cmaui_port_1: - cmaui_port_1 - link + dependency_cmaui_port_2: + - cmaui_port_2 + - dependency local_storage_server_abc: - server_abc - local_storage
\ 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/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml index 992e1c017c..1d2d9ada48 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: nested2 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 @@ -93,6 +69,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: security_group_name fixed_ips: @@ -100,6 +82,9 @@ topology_template: get_input: - cmaui_oam_ips - 0 + mac_requirements: + mac_count_required: + is_required: false network: get_input: p1 requirements: @@ -108,7 +93,7 @@ topology_template: node: server_cmaui relationship: tosca.relationships.network.BindsTo groups: - nested2: + nested2_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/nested2.yml @@ -119,28 +104,172 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested2 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 + cpu_server_cmaui: + - server_cmaui + - cpu + feature_cmaui_port_1: + - cmaui_port_1 + - 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 + disk.device.latency_server_cmaui: + - server_cmaui + - disk.device.latency + disk.device.write.requests_server_cmaui: + - server_cmaui + - disk.device.write.requests + disk.read.requests_server_cmaui: + - server_cmaui + - disk.read.requests + disk.device.capacity_server_cmaui: + - server_cmaui + - disk.device.capacity + network.outgoing.packets.rate_cmaui_port_1: + - cmaui_port_1 + - 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 + 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 + 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 + 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.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 - scalable_server_cmaui: + - disk.iops + disk.device.iops_server_cmaui: - server_cmaui - - scalable - attachment_cmaui_port_1: + - disk.device.iops + disk.read.bytes_server_cmaui: + - server_cmaui + - 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_1: - cmaui_port_1 - link
\ No newline at end of file |