Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions components/schemas/containers/config/ContainerVolume.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,17 @@ properties:
external:
anyOf:
- type: object
required:
- mode
properties:
identifier:
oneOf:
- $ref: ../../Identifier.yml
- type: "null"
description: The identifier of the external volume.
mode:
type: string
description: The attachment mode for the external volume
enum: [instance, host]
id:
oneOf:
- $ref: ../../ID.yml
- type: "null"
description: The id of the external volume.
- type: "null"
destination:
type: string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ required:
- about
- cluster
- location_id
- server_ids
- source
- options
- state
Expand All @@ -28,23 +29,25 @@ properties:
cluster:
$ref: "../../Identifier.yml"
identifier:
anyOf:
oneOf:
- $ref: "../../Identifier.yml"
- type: "null"
location_id:
$ref: "../../ID.yml"
server_ids:
type: array
items:
$ref: "../../ID.yml"
source:
$ref: "./sources/ExternalVolumeSource.yml"
attachment:
description: Information about the resource the external volume is currently attached to.
anyOf:
- $ref: "./ExternalVolumeAttachment.yml"
- type: "null"
$ref: "./attachment/ExternalVolumeAttachment.yml"
size:
description: >
Size of the external volume; may be null or omitted if the size has not yet
been determined.
anyOf:
oneOf:
- $ref: "../../DataSize.yml"
- type: "null"
options:
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
title: ExternalVolumeAttachment
type: object
description: Attachment configuration for an external volume.
discriminator:
propertyName: type
mapping:
block: ./ExternalVolumeAttachmentBlock.yml
filesystem: ./ExternalVolumeAttachmentFileSystem.yml
oneOf:
- $ref: ./ExternalVolumeAttachmentBlock.yml
- $ref: ./ExternalVolumeAttachmentFileSystem.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
title: ExternalVolumeAttachmentBlock
type: object
description: Configuration for a block volume attachment.
required: [type, mode, details]
properties:
type:
type: string
enum: [block]
mode:
type: string
description: The access mode for the attachment.
enum:
- single-instance-writer
- single-instance-read-only
- single-node-writer
- single-node-read-only
- multi-node-writer
- multi-node-read-only
details:
type: object
description: Details for a block attachment. Present when `type` is `block`.
# No fields today, reserved for future expansion
properties: {}
additionalProperties: false
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
title: ExternalVolumeAttachmentFileSystem
type: object
description: Configuration for a filesystem volume attachment.
required: [type, mode, details]
properties:
type:
type: string
enum: [filesystem]
mode:
type: string
description: The access mode for the attachment.
enum:
- single-instance-writer
- single-instance-read-only
- single-node-writer
- single-node-read-only
- multi-node-writer
- multi-node-read-only
details:
type: object
description: Details for a filesystem attachment. Present when `type` is `filesystem`.
# No fields today, reserved for future expansion
properties: {}
additionalProperties: false
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,4 @@ properties:
- attach
description: The name of the action to perform (attach).
contents:
type: object
required:
- instance_id
properties:
instance_id:
$ref: ../../../ID.yml
$ref: ../attachment/ExternalVolumeAttachment.yml
8 changes: 0 additions & 8 deletions platform/api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -649,14 +649,6 @@ paths:
"/v1/infrastructure/servers/{serverId}/console":
$ref: "./paths/infrastructure/servers/console.yml"

## SANs
"/v1/infrastructure/san/targets":
$ref: "./paths/infrastructure/san/targets/targets.yml"
"/v1/infrastructure/san/luns":
$ref: "./paths/infrastructure/san/luns/luns.yml"
"/v1/infrastructure/san/tasks":
$ref: "./paths/infrastructure/san/tasks.yml"

## IPs
"/v1/infrastructure/ips/pools":
$ref: "./paths/infrastructure/ips/pools.yml"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ post:
- name
- cluster
- location_id
- server_ids
- attachment
- source
- options
properties:
Expand All @@ -106,8 +108,15 @@ post:
description: The cluster this external volume is associated with.
location_id:
$ref: ../../../../components/schemas/ID.yml
server_ids:
type: array
items:
$ref: ../../../../components/schemas/ID.yml
source:
$ref: ../../../../components/schemas/infrastructure/external-volumes/sources/ExternalVolumeSource.yml
attachment:
description: Information about the resource the external volume is currently attached to.
$ref: "../../../../components/schemas/infrastructure/external-volumes/attachment/ExternalVolumeAttachment.yml"
options:
$ref: ../../../../components/schemas/infrastructure/external-volumes/ExternalVolumeOptions.yml
about:
Expand Down
8 changes: 0 additions & 8 deletions platform/paths/infrastructure/san/includes/SanLunIncludes.yml

This file was deleted.

85 changes: 0 additions & 85 deletions platform/paths/infrastructure/san/luns/luns.yml

This file was deleted.

56 changes: 0 additions & 56 deletions platform/paths/infrastructure/san/targets/targets.yml

This file was deleted.

26 changes: 0 additions & 26 deletions platform/paths/infrastructure/san/tasks.yml

This file was deleted.

Loading