From ed64b5edff15e702493df21aa3230b81593e6133 Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Fri, 9 Jun 2017 03:19:04 +0300 Subject: [SDC-29] catalog 1707 rebase commit. Change-Id: I43c3dc5cf44abf5da817649bc738938a3e8388c1 Signed-off-by: Michael Lando --- .../tosca/heat-types/cinderVolume/cinderVolume.yml | 118 ++++++++------------- .../tosca/heat-types/cinderVolume/cinderVolume.zip | Bin 1425 -> 1229 bytes 2 files changed, 45 insertions(+), 73 deletions(-) (limited to 'catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume') diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.yml b/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.yml index 3bb227d1ec..87dfc313ae 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.yml +++ b/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.yml @@ -1,78 +1,50 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: CinderVolumeGlobalTypes - template_version: 1.0.0 -description: Cinder Volume TOSCA Global Types -relationship_types: - org.openecomp.relationships.cinder.VolumeAttachesTo: - derived_from: tosca.relationships.AttachesTo - description: This type represents an attachment relationship for associating volume - properties: - volume_id: - type: string - description: The ID of the volume to be attached - required: true - status: SUPPORTED - location: - type: string - description: The location where the volume is exposed on the instance, mountpoint - required: false - status: SUPPORTED - instance_uuid: - type: string - description: The ID of the server to which the volume attaches - required: true - status: SUPPORTED - attributes: - show: - type: string - description: Detailed information about resource - status: SUPPORTED node_types: org.openecomp.resource.vfc.nodes.heat.cinder.Volume: - derived_from: tosca.nodes.BlockStorage + derived_from: org.openecomp.resource.vfc.nodes.volume properties: availability_zone: - type: string description: The availability zone in which the volume will be created - required: false + type: string status: SUPPORTED + required: false image: - type: string description: If specified, the name or ID of the image to create the volume from - required: false + type: string status: SUPPORTED + required: false metadata: - type: map description: Key/value pairs to associate with the volume - required: false + type: map status: SUPPORTED entry_schema: type: string + required: false volume_type: - type: string description: If specified, the type of volume to use, mapping to a specific backend - required: false + type: string status: SUPPORTED + required: false description: - type: string description: A description of the volume - required: false + type: string status: SUPPORTED + required: false device_type: - type: string description: Device type - required: false + type: string status: SUPPORTED + required: false constraints: - valid_values: - cdrom - disk disk_bus: + description: 'Bus of the device: hypervisor driver chooses a suitable default + if omitted' type: string - description: 'Bus of the device: hypervisor driver chooses a suitable default if omitted' - required: false status: SUPPORTED + required: false constraints: - valid_values: - ide @@ -81,97 +53,97 @@ node_types: - usb - virtio backup_id: - type: string description: If specified, the backup to create the volume from - required: false + type: string status: SUPPORTED + required: false source_volid: - type: string description: If specified, the volume to use as source - required: false + type: string status: SUPPORTED + required: false boot_index: - type: integer description: Integer used for ordering the boot disks - required: false + type: integer status: SUPPORTED + required: false size: - type: scalar-unit.size description: The requested storage size (default unit is MB) - required: false + type: scalar-unit.size status: SUPPORTED + required: false constraints: - greater_or_equal: 1 GB read_only: - type: boolean description: Enables or disables read-only access mode of volume - required: false + type: boolean status: SUPPORTED + required: false name: - type: string description: A name used to distinguish the volume - required: false + type: string status: SUPPORTED + required: false scheduler_hints: - type: map description: Arbitrary key-value pairs specified by the client to help the Cinder scheduler creating a volume - required: false + type: map status: SUPPORTED entry_schema: type: string + required: false swap_size: - type: scalar-unit.size description: The size of the swap, in MB - required: false + type: scalar-unit.size status: SUPPORTED + required: false delete_on_termination: - type: boolean description: Indicate whether the volume should be deleted when the server is terminated - required: false + type: boolean status: SUPPORTED + required: false multiattach: - type: boolean description: Whether allow the volume to be attached more than once - required: false + type: boolean status: SUPPORTED + required: false attributes: display_description: - type: string description: Description of the volume + type: string status: SUPPORTED attachments: - type: string description: The list of attachments of the volume + type: string status: SUPPORTED entry_schema: type: string encrypted: - type: boolean description: Boolean indicating if the volume is encrypted or not + type: boolean status: SUPPORTED show: - type: string description: Detailed information about resource + type: string status: SUPPORTED created_at: - type: timestamp description: The timestamp indicating volume creation + type: timestamp status: SUPPORTED display_name: - type: string description: Name of the volume + type: string status: SUPPORTED metadata_values: - type: map description: Key/value pairs associated with the volume in raw dict form + type: map status: SUPPORTED entry_schema: type: string bootable: - type: boolean description: Boolean indicating if the volume can be booted or not + type: boolean status: SUPPORTED status: - type: string description: The current status of the volume + type: string status: SUPPORTED diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.zip b/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.zip index 88506743ac..8b9a455c54 100644 Binary files a/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.zip and b/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.zip differ -- cgit 1.2.3-korg