summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-08-09 17:44:46 +0000
committerGerrit Code Review <review@openstack.org>2018-08-09 17:44:47 +0000
commit9d546732c8ef13ec604c11067f6a304efc414dc5 (patch)
tree1ca7e81ae7b51f3181b05c4f1f4774f13a2cd2d7
parent93888df0da6adfa0c5f448692e5a480364dbe675 (diff)
parenta2a17c06252a98c293e2c547ebe9f54b15366193 (diff)
downloadnova-9d546732c8ef13ec604c11067f6a304efc414dc5.tar.gz
Merge "Update the parameter explain when updating a volume attachment"
-rw-r--r--api-ref/source/os-volume-attachments.inc8
-rw-r--r--api-ref/source/parameters.yaml14
2 files changed, 13 insertions, 9 deletions
diff --git a/api-ref/source/os-volume-attachments.inc b/api-ref/source/os-volume-attachments.inc
index 1f5042fe39..99a125562a 100644
--- a/api-ref/source/os-volume-attachments.inc
+++ b/api-ref/source/os-volume-attachments.inc
@@ -138,13 +138,17 @@ Response
Update a volume attachment
==========================
-.. rest_method:: PUT /servers/{server_id}/os-volume_attachments/{attachment_id}
+.. rest_method:: PUT /servers/{server_id}/os-volume_attachments/{volume_id}
Update a volume attachment.
.. note:: This action only valid when the server is in ACTIVE, PAUSED and RESIZED state,
or a conflict(409) error will be returned.
+Policy defaults enable only users with the administrative role or
+the owner of the server to perform this operation. Cloud providers
+can change these permissions through the ``policy.json`` file.
+
Normal response codes: 202
Error response codes: badRequest(400), unauthorized(401), forbidden(403), itemNotFound(404), conflict(409)
@@ -155,7 +159,7 @@ Request
.. rest_parameters:: parameters.yaml
- server_id: server_id_path
- - attachment_id: attachment_id
+ - volume_id: volume_id_swap_src
- volumeAttachment: volumeAttachment_put
- volumeId: volumeId_swap
diff --git a/api-ref/source/parameters.yaml b/api-ref/source/parameters.yaml
index 53cade4277..74621f2e22 100644
--- a/api-ref/source/parameters.yaml
+++ b/api-ref/source/parameters.yaml
@@ -87,12 +87,6 @@ api_version:
type: string
description: >
The API version as returned in the links from the ``GET /`` call.
-attachment_id:
- description: |
- The UUID of the attachment.
- in: path
- required: true
- type: string
before_timestamp:
description: |
Filters the response by the date and time before which to list usage
@@ -349,6 +343,12 @@ volume_id_path:
in: path
required: true
type: string
+volume_id_swap_src:
+ description: |
+ The UUID of the volume being replaced.
+ in: path
+ required: true
+ type: string
volume_id_to_detach_path:
description: |
The UUID of the volume to detach.
@@ -6683,7 +6683,7 @@ volumeAttachment_post:
volumeAttachment_put:
description: |
A dictionary representation of a volume attachment containing the field
- ``volumeId``.
+ ``volumeId`` which is the UUID of the replacement volume.
in: body
required: true
type: object