diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection')
7 files changed, 1014 insertions, 127 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index e77677efb7..e597cd7ff1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/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,70 +11,125 @@ node_types: cmaui_names: type: list description: CMAUI1, CMAUI2 server names + required: true + status: SUPPORTED entry_schema: type: string cmaui_cinder_volume_size: type: float description: the size of the CMAUI Cinder volume + required: true + status: SUPPORTED timezone: type: string description: timezone + required: true + status: SUPPORTED security_group_name: type: string description: the name of security group + required: true + status: SUPPORTED cmaui_volume: type: string description: Volume for CMAUI server + required: true + status: SUPPORTED oam_network_netmask: type: string description: oam network gateway + required: true + status: SUPPORTED cmaui_image: type: string description: Image for CMAUI server + required: true + status: SUPPORTED vnf_id: type: string description: Unique ID for this VNF instance + required: false default: This_is_ths_MMSC-CMAUI_id + status: SUPPORTED cmaui_flavor: type: string description: Flavor for CMAUI server + required: true + status: SUPPORTED oam_network_gateway: type: string description: oam network gateway + required: true + status: SUPPORTED availability_zone_0: type: string description: availabilityzone name + required: true + status: SUPPORTED + inner_cmaui_volume_b3: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string cmaui_oam_ips: type: list description: CMAUI oam_net IP addresses + required: true + status: SUPPORTED entry_schema: type: string inner_cmaui_volume_a1: type: string description: the name of the target volume backend + required: true + status: SUPPORTED inner_cmaui_volume_b2: type: string description: the name of the target volume backend + required: true + status: SUPPORTED external_dns: type: string description: dns server + required: true + status: SUPPORTED oam_net_name: type: string description: UID of OAM network + required: true + status: SUPPORTED external_ntp: type: string description: ntp server + required: true + status: SUPPORTED CMAUI_volume_type: type: string description: the name of the target volume backend + 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_cmaui2: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - local_storage_server_cmaui2: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage @@ -106,6 +137,13 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_server_cmaui1: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - local_storage_server_cmaui1: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage @@ -113,41 +151,57 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_cmaui_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_cmaui_port_0: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + memory.usage_server_cmaui2: + type: org.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_cmaui1: type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - endpoint_server_cmaui1: - type: tosca.capabilities.Endpoint.Admin + scalable_server_cmaui2: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - os_server_cmaui1: - type: tosca.capabilities.OperatingSystem + cpu.delta_server_cmaui2: + type: org.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_cmaui2: - type: tosca.capabilities.Scalable + disk.device.write.requests.rate_server_cmaui2: + type: org.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_cmaui2: - type: tosca.capabilities.Endpoint.Admin + cpu.delta_server_cmaui1: + type: org.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.iops_server_cmaui1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -158,18 +212,33 @@ node_types: occurrences: - 1 - UNBOUNDED - os_server_cmaui2: - type: tosca.capabilities.OperatingSystem + disk.device.write.requests.rate_server_cmaui1: + type: org.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_cmaui2: - type: tosca.capabilities.network.Bindable + disk.iops_server_cmaui2: + type: org.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_0: - type: tosca.capabilities.Attachment + disk.device.write.bytes.rate_server_cmaui2: + type: org.openecomp.capabilities.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_cmaui1: + type: org.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_cmaui1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -180,8 +249,533 @@ node_types: occurrences: - 1 - UNBOUNDED + disk.write.requests_server_cmaui2: + type: org.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_cmaui1: + type: org.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_cmaui2: + type: org.openecomp.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_cmaui1: + type: org.openecomp.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_cmaui2: + type: org.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_cmaui2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_server_cmaui1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.root.size_server_cmaui1: + type: org.openecomp.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.write.requests_server_cmaui1: + type: org.openecomp.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_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_server_cmaui2: + type: org.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_cmaui1: + type: org.openecomp.capabilities.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_cmaui2: + type: org.openecomp.capabilities.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_cmaui1: + type: org.openecomp.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.allocation_server_cmaui2: + type: org.openecomp.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_cmaui1: + type: org.openecomp.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_cmaui1: + type: org.openecomp.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_cmaui2: + type: org.openecomp.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_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_server_cmaui2: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + disk.read.requests_server_cmaui2: + type: org.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_cmaui1: type: tosca.capabilities.network.Bindable occurrences: - 1 + - UNBOUNDED + disk.read.requests_server_cmaui1: + type: org.openecomp.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_cmaui1: + type: org.openecomp.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_cmaui2: + type: org.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_cmaui1: + type: org.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_cmaui2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_cmaui_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + binding_cmaui_port_2: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.device.write.bytes_server_cmaui2: + type: org.openecomp.capabilities.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_cmaui1: + type: org.openecomp.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_cmaui1: + type: org.openecomp.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_cmaui2: + type: org.openecomp.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 + os_server_cmaui1: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_cmaui_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_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_cmaui2: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_cmaui_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes.rate_server_cmaui1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes.rate_server_cmaui1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes.rate_server_cmaui2: + type: org.openecomp.capabilities.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_cmaui1: + type: org.openecomp.capabilities.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_cmaui2: + type: org.openecomp.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_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.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 + feature_cmaui_port_2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes.rate_server_cmaui2: + type: org.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_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + attachment_cmaui_port_2: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_cmaui_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_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_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes_server_cmaui2: + type: org.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_cmaui2: + type: org.openecomp.capabilities.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_cmaui2: + type: org.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_cmaui1: + type: org.openecomp.capabilities.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_cmaui1: + type: org.openecomp.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_cmaui1: + type: org.openecomp.capabilities.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_cmaui1: + type: org.openecomp.capabilities.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_cmaui2: + type: org.openecomp.capabilities.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_cmaui2: + type: org.openecomp.capabilities.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_cmaui1: + type: org.openecomp.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_cmaui2: + type: org.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_cmaui1: + type: org.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_cmaui2: + type: org.openecomp.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_cmaui1: + type: org.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_cmaui1: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + endpoint_server_cmaui2: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + cpu_util_server_cmaui1: + type: org.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_cmaui2: + type: org.openecomp.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_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_cmaui_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.root.size_server_cmaui2: + type: org.openecomp.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_cmaui2: + type: org.openecomp.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_cmaui1: + type: org.openecomp.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_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.latency_server_cmaui1: + type: org.openecomp.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 + disk.device.latency_server_cmaui2: + type: org.openecomp.capabilities.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_cmaui1: + type: org.openecomp.capabilities.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_cmaui2: + type: org.openecomp.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_cmaui2: + type: org.openecomp.capabilities.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_cmaui2: + type: org.openecomp.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_cmaui1: + type: org.openecomp.capabilities.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_cmaui1: + type: org.openecomp.capabilities.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_cmaui2: + type: org.openecomp.capabilities.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_cmaui1: + type: org.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/novatovolumeconnection/innernestedconnection/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/MainServiceTemplate.yaml index 4507d8f8b2..d3c471ef0e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/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: cmaui_names: @@ -97,6 +73,12 @@ topology_template: type: string description: Unique ID for this VNF instance default: This_is_ths_MMSC-CMAUI_id + inner_cmaui_volume_b3: + hidden: false + immutable: false + type: list + entry_schema: + type: string inner_cmaui_volume_a1: hidden: false immutable: false @@ -142,6 +124,10 @@ topology_template: properties: service_template_filter: substitute_service_template: nestedServiceTemplate.yaml + inner_cmaui_volume_b3: + get_input: + - inner_cmaui_volume_b3 + - 0 inner_cmaui_volume_a1: get_input: inner_cmaui_volume_a1 inner_cmaui_volume_b2: @@ -172,7 +158,14 @@ topology_template: get_input: CMAUI_volume_type size: '(get_input : cmaui_cinder_volume_size) * 1024' groups: - a_vol: + main_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/main.yml + description: cmaui server template for vMMSC + members: + - stam_nested + a_vol_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/a_vol.yml @@ -180,15 +173,10 @@ topology_template: members: - inner_cmaui_volume_a1 - cmaui_volume2 - main: - type: org.openecomp.groups.heat.HeatStack - properties: - heat_file: ../Artifacts/main.yml - description: cmaui server template for vMMSC - members: - - stam_nested outputs: inner_cmaui_volume_a2: value: cmaui_volume2 + inner_cmaui_volume_b3: + value: inner_cmaui_volume_a1 inner_cmaui_volume_a1: value: inner_cmaui_volume_a1
\ 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/novatovolumeconnection/innernestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml index a9ec66bf29..bd995dbf48 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/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 @@ -100,6 +76,12 @@ topology_template: immutable: false type: string description: availabilityzone name + inner_cmaui_volume_b3: + hidden: false + immutable: false + type: list + entry_schema: + type: string cmaui_oam_ips: label: CMAUI oam_net IP addresses hidden: false @@ -148,6 +130,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 +143,10 @@ topology_template: get_input: - cmaui_oam_ips - 0 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -200,6 +192,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: @@ -207,6 +205,10 @@ topology_template: get_input: - cmaui_oam_ips - 0 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -215,7 +217,7 @@ topology_template: node: server_cmaui1 relationship: tosca.relationships.network.BindsTo groups: - nested: + nested_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/nested.yml @@ -228,43 +230,328 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested capabilities: + memory.usage_server_cmaui2: + - server_cmaui2 + - memory.usage scalable_server_cmaui1: - server_cmaui1 - scalable - endpoint_server_cmaui1: - - server_cmaui1 - - endpoint - os_server_cmaui1: - - server_cmaui1 - - os scalable_server_cmaui2: - server_cmaui2 - scalable - endpoint_server_cmaui2: + cpu.delta_server_cmaui2: - server_cmaui2 - - endpoint - attachment_cmaui_port_2: - - cmaui_port_2 - - attachment + - cpu.delta + disk.device.write.requests.rate_server_cmaui2: + - server_cmaui2 + - disk.device.write.requests.rate + cpu.delta_server_cmaui1: + - server_cmaui1 + - cpu.delta + disk.iops_server_cmaui1: + - server_cmaui1 + - disk.iops host_server_cmaui1: - server_cmaui1 - host - os_server_cmaui2: + disk.device.write.requests.rate_server_cmaui1: + - server_cmaui1 + - disk.device.write.requests.rate + disk.iops_server_cmaui2: - server_cmaui2 - - os + - disk.iops + disk.device.write.bytes.rate_server_cmaui2: + - server_cmaui2 + - disk.device.write.bytes.rate + disk.device.write.bytes.rate_server_cmaui1: + - server_cmaui1 + - disk.device.write.bytes.rate + memory.usage_server_cmaui1: + - server_cmaui1 + - memory.usage + host_server_cmaui2: + - server_cmaui2 + - host + disk.write.requests_server_cmaui2: + - server_cmaui2 + - disk.write.requests + memory_server_cmaui1: + - server_cmaui1 + - memory + memory_server_cmaui2: + - server_cmaui2 + - memory + disk.write.bytes_server_cmaui1: + - server_cmaui1 + - disk.write.bytes + disk.write.bytes_server_cmaui2: + - server_cmaui2 + - disk.write.bytes + feature_server_cmaui2: + - server_cmaui2 + - feature + feature_server_cmaui1: + - server_cmaui1 + - feature + disk.root.size_server_cmaui1: + - server_cmaui1 + - disk.root.size + network.outgoing.bytes_cmaui_port_2: + - cmaui_port_2 + - network.outgoing.bytes + disk.write.requests_server_cmaui1: + - server_cmaui1 + - disk.write.requests + network.outgoing.bytes_cmaui_port_0: + - cmaui_port_0 + - network.outgoing.bytes + cpu_server_cmaui2: + - server_cmaui2 + - cpu + cpu_server_cmaui1: + - server_cmaui1 + - cpu + disk.device.read.requests_server_cmaui2: + - server_cmaui2 + - disk.device.read.requests + disk.device.read.requests_server_cmaui1: + - server_cmaui1 + - disk.device.read.requests + network.incoming.packets_cmaui_port_2: + - cmaui_port_2 + - network.incoming.packets + disk.allocation_server_cmaui2: + - server_cmaui2 + - disk.allocation + disk.allocation_server_cmaui1: + - server_cmaui1 + - disk.allocation + disk.read.bytes.rate_server_cmaui1: + - server_cmaui1 + - disk.read.bytes.rate + disk.read.bytes.rate_server_cmaui2: + - server_cmaui2 + - disk.read.bytes.rate + network.incoming.packets_cmaui_port_0: + - cmaui_port_0 + - network.incoming.packets binding_server_cmaui2: - server_cmaui2 - binding + disk.read.requests_server_cmaui2: + - server_cmaui2 + - disk.read.requests + binding_server_cmaui1: + - server_cmaui1 + - binding + disk.read.requests_server_cmaui1: + - server_cmaui1 + - disk.read.requests + disk.latency_server_cmaui1: + - server_cmaui1 + - disk.latency + disk.latency_server_cmaui2: + - server_cmaui2 + - disk.latency + memory.resident_server_cmaui1: + - server_cmaui1 + - memory.resident + memory.resident_server_cmaui2: + - server_cmaui2 + - memory.resident + binding_cmaui_port_0: + - cmaui_port_0 + - binding + binding_cmaui_port_2: + - cmaui_port_2 + - binding + disk.device.write.bytes_server_cmaui2: + - server_cmaui2 + - disk.device.write.bytes + disk.device.write.bytes_server_cmaui1: + - server_cmaui1 + - disk.device.write.bytes + disk.capacity_server_cmaui1: + - server_cmaui1 + - disk.capacity + disk.capacity_server_cmaui2: + - server_cmaui2 + - disk.capacity + network.outgoing.bytes.rate_cmaui_port_2: + - cmaui_port_2 + - network.outgoing.bytes.rate + os_server_cmaui1: + - server_cmaui1 + - os + network.outgoing.bytes.rate_cmaui_port_0: + - cmaui_port_0 + - network.outgoing.bytes.rate + network.incoming.bytes_cmaui_port_2: + - cmaui_port_2 + - network.incoming.bytes + os_server_cmaui2: + - server_cmaui2 + - os + network.incoming.bytes_cmaui_port_0: + - cmaui_port_0 + - network.incoming.bytes + disk.device.read.bytes.rate_server_cmaui1: + - server_cmaui1 + - disk.device.read.bytes.rate + disk.write.bytes.rate_server_cmaui1: + - server_cmaui1 + - disk.write.bytes.rate + disk.write.bytes.rate_server_cmaui2: + - server_cmaui2 + - disk.write.bytes.rate + disk.device.write.requests_server_cmaui1: + - server_cmaui1 + - disk.device.write.requests + disk.device.write.requests_server_cmaui2: + - server_cmaui2 + - disk.device.write.requests + network.incoming.packets.rate_cmaui_port_0: + - cmaui_port_0 + - network.incoming.packets.rate + network.incoming.packets.rate_cmaui_port_2: + - cmaui_port_2 + - network.incoming.packets.rate + feature_cmaui_port_2: + - cmaui_port_2 + - feature + disk.device.read.bytes.rate_server_cmaui2: + - server_cmaui2 + - disk.device.read.bytes.rate + feature_cmaui_port_0: + - cmaui_port_0 + - feature + attachment_cmaui_port_2: + - cmaui_port_2 + - attachment + network.outgoing.packets.rate_cmaui_port_0: + - cmaui_port_0 + - network.outgoing.packets.rate + network.outgoing.packets.rate_cmaui_port_2: + - cmaui_port_2 + - network.outgoing.packets.rate attachment_cmaui_port_0: - cmaui_port_0 - attachment - host_server_cmaui2: + disk.read.bytes_server_cmaui2: - server_cmaui2 - - host - binding_server_cmaui1: + - disk.read.bytes + instance_server_cmaui2: + - server_cmaui2 + - instance + disk.device.allocation_server_cmaui2: + - server_cmaui2 + - disk.device.allocation + instance_server_cmaui1: - server_cmaui1 - - binding + - instance + disk.device.allocation_server_cmaui1: + - server_cmaui1 + - disk.device.allocation + disk.read.bytes_server_cmaui1: + - server_cmaui1 + - disk.read.bytes + disk.device.usage_server_cmaui1: + - server_cmaui1 + - disk.device.usage + disk.device.usage_server_cmaui2: + - server_cmaui2 + - disk.device.usage + disk.device.capacity_server_cmaui2: + - server_cmaui2 + - disk.device.capacity + disk.device.capacity_server_cmaui1: + - server_cmaui1 + - disk.device.capacity + disk.usage_server_cmaui2: + - server_cmaui2 + - disk.usage + vcpus_server_cmaui1: + - server_cmaui1 + - vcpus + vcpus_server_cmaui2: + - server_cmaui2 + - vcpus + disk.usage_server_cmaui1: + - server_cmaui1 + - disk.usage + endpoint_server_cmaui1: + - server_cmaui1 + - endpoint + endpoint_server_cmaui2: + - server_cmaui2 + - endpoint + cpu_util_server_cmaui1: + - server_cmaui1 + - cpu_util + cpu_util_server_cmaui2: + - server_cmaui2 + - cpu_util + network.incoming.bytes.rate_cmaui_port_0: + - cmaui_port_0 + - network.incoming.bytes.rate + network.incoming.bytes.rate_cmaui_port_2: + - cmaui_port_2 + - network.incoming.bytes.rate + disk.root.size_server_cmaui2: + - server_cmaui2 + - disk.root.size + disk.write.requests.rate_server_cmaui2: + - server_cmaui2 + - disk.write.requests.rate + disk.write.requests.rate_server_cmaui1: + - server_cmaui1 + - disk.write.requests.rate + network.outpoing.packets_cmaui_port_0: + - cmaui_port_0 + - network.outpoing.packets + disk.device.latency_server_cmaui1: + - server_cmaui1 + - disk.device.latency + network.outpoing.packets_cmaui_port_2: + - cmaui_port_2 + - network.outpoing.packets + disk.device.latency_server_cmaui2: + - server_cmaui2 + - disk.device.latency + disk.device.iops_server_cmaui1: + - server_cmaui1 + - disk.device.iops + disk.device.iops_server_cmaui2: + - server_cmaui2 + - disk.device.iops + disk.ephemeral.size_server_cmaui2: + - server_cmaui2 + - disk.ephemeral.size + disk.device.read.requests.rate_server_cmaui2: + - server_cmaui2 + - disk.device.read.requests.rate + disk.ephemeral.size_server_cmaui1: + - server_cmaui1 + - disk.ephemeral.size + disk.device.read.requests.rate_server_cmaui1: + - server_cmaui1 + - disk.device.read.requests.rate + disk.device.read.bytes_server_cmaui2: + - server_cmaui2 + - disk.device.read.bytes + disk.device.read.bytes_server_cmaui1: + - server_cmaui1 + - disk.device.read.bytes requirements: + dependency_server_cmaui1: + - server_cmaui1 + - dependency + dependency_server_cmaui2: + - server_cmaui2 + - dependency + dependency_cmaui_port_0: + - cmaui_port_0 + - dependency link_cmaui_port_0: - cmaui_port_0 - link @@ -274,6 +561,9 @@ topology_template: local_storage_server_cmaui2: - server_cmaui2 - local_storage + dependency_cmaui_port_2: + - cmaui_port_2 + - dependency local_storage_server_cmaui1: - server_cmaui1 - 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/novatovolumeconnection/innernestedconnection/inputfiles/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/inputfiles/MANIFEST.json index 0aa103e5b8..59cb760a67 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/inputfiles/MANIFEST.json +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/inputfiles/MANIFEST.json @@ -12,7 +12,7 @@ "file": "main.yml", "type": "HEAT", "isBase": "false", - "data":[ + "data": [ { "file": "a_vol.yml", "type": "HEAT_VOL", diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/inputfiles/a_vol.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/inputfiles/a_vol.yml index df5be20848..6a63416cbd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/inputfiles/a_vol.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/inputfiles/a_vol.yml @@ -29,4 +29,6 @@ outputs: inner_cmaui_volume_a1: value: {get_resource: inner_cmaui_volume_a1} inner_cmaui_volume_a2: - value: {get_resource: cmaui_volume2}
\ No newline at end of file + value: {get_resource: cmaui_volume2} + inner_cmaui_volume_b3: + value: {get_resource: inner_cmaui_volume_a1} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/inputfiles/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/inputfiles/main.yml index 7994b332df..564cb17510 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/inputfiles/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/inputfiles/main.yml @@ -15,6 +15,8 @@ parameters: type: string description: Unique ID for this VNF instance default: This_is_ths_MMSC-CMAUI_id + inner_cmaui_volume_b3: + type: comma_delimited_list cmaui_names: type: comma_delimited_list description: CMAUI1, CMAUI2 server names @@ -74,4 +76,5 @@ resources: type: nested.yml properties: inner_cmaui_volume_a1: { get_param: inner_cmaui_volume_a1} - inner_cmaui_volume_b2: { get_param: inner_cmaui_volume_a2}
\ No newline at end of file + inner_cmaui_volume_b2: { get_param: inner_cmaui_volume_a2} + inner_cmaui_volume_b3: { get_param: [inner_cmaui_volume_b3,0]}
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/inputfiles/nested.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/inputfiles/nested.yml index 078b228d29..b423836cbe 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/inputfiles/nested.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/inputfiles/nested.yml @@ -71,6 +71,10 @@ parameters: type: string label: CMAUI vm volume type description: the name of the target volume backend + inner_cmaui_volume_b3: + type: comma_delimited_list + + resources: @@ -107,6 +111,12 @@ resources: volume_id: {get_param: inner_cmaui_volume_b2} instance_uuid: {get_resource: server_cmaui2} + cmaui_volume_attachment4: + type: OS::Cinder::VolumeAttachment + properties: + volume_id: {get_param: inner_cmaui_volume_b3} + instance_uuid: {get_resource: server_cmaui1} + server_cmaui1: type: OS::Nova::Server properties: |