From 28831f3b3d5b889a8e260b007b4010a0ed571ec0 Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Fri, 24 Mar 2017 16:27:06 -0400 Subject: [PATCH] api-ref: fix os-extended-volumes:volumes_attached in servers responses There are two main changes here: 1. The contents of the os-extended-volumes:volumes_attached list are described, which are the id and delete_on_termination keys, the latter being introduced in the GET /servers response in 2.3. 2. The os-extended-volumes:volumes_attached parameters are removed from the PUT /servers and POST /servers responses, since we don't actually include those in the response for create and update operations, only GET /servers/{server_id} and GET /servers/detail operations. Note: create server is fixed in a follow up patch. Change-Id: Ic92055e3095d220a3a11e35628f04e9e67c6b71a Closes-Bug: #1675559 --- api-ref/source/parameters.yaml | 16 ++++++++++++++++ api-ref/source/servers.inc | 6 ++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/api-ref/source/parameters.yaml b/api-ref/source/parameters.yaml index 36fe6d8948..f9fd98f863 100644 --- a/api-ref/source/parameters.yaml +++ b/api-ref/source/parameters.yaml @@ -3587,6 +3587,22 @@ os-extended-volumes:volumes_attached: in: body required: true type: array +os-extended-volumes:volumes_attached.delete_on_termination: + description: | + A flag indicating if the attached volume will be deleted + when the server is deleted. By default this is False and + can only be set when creating a volume while creating a + server, which is commonly referred to as boot from volume. + in: body + required: true + type: boolean + min_version: 2.3 +os-extended-volumes:volumes_attached.id: + description: | + The attached volume ID. + in: body + required: true + type: string os-getConsoleOutput: description: | The action. diff --git a/api-ref/source/servers.inc b/api-ref/source/servers.inc index 7ee17ca177..1575bb0329 100644 --- a/api-ref/source/servers.inc +++ b/api-ref/source/servers.inc @@ -371,7 +371,6 @@ Response - OS-EXT-STS:power_state: OS-EXT-STS:power_state - OS-EXT-STS:task_state: OS-EXT-STS:task_state - OS-EXT-STS:vm_state: OS-EXT-STS:vm_state - - os-extended-volumes:volumes_attached: os-extended-volumes:volumes_attached - OS-SRV-USG:launched_at: OS-SRV-USG:launched_at - OS-SRV-USG:terminated_at: OS-SRV-USG:terminated_at - progress: progress @@ -555,6 +554,8 @@ Response - OS-EXT-STS:task_state: OS-EXT-STS:task_state - OS-EXT-STS:vm_state: OS-EXT-STS:vm_state - os-extended-volumes:volumes_attached: os-extended-volumes:volumes_attached + - os-extended-volumes:volumes_attached.id: os-extended-volumes:volumes_attached.id + - os-extended-volumes:volumes_attached.delete_on_termination: os-extended-volumes:volumes_attached.delete_on_termination - OS-SRV-USG:launched_at: OS-SRV-USG:launched_at - OS-SRV-USG:terminated_at: OS-SRV-USG:terminated_at - progress: progress @@ -641,6 +642,8 @@ Response - OS-EXT-STS:task_state: OS-EXT-STS:task_state - OS-EXT-STS:vm_state: OS-EXT-STS:vm_state - os-extended-volumes:volumes_attached: os-extended-volumes:volumes_attached + - os-extended-volumes:volumes_attached.id: os-extended-volumes:volumes_attached.id + - os-extended-volumes:volumes_attached.delete_on_termination: os-extended-volumes:volumes_attached.delete_on_termination - OS-SRV-USG:launched_at: OS-SRV-USG:launched_at - OS-SRV-USG:terminated_at: OS-SRV-USG:terminated_at - progress: progress @@ -735,7 +738,6 @@ Response - OS-EXT-STS:power_state: OS-EXT-STS:power_state - OS-EXT-STS:task_state: OS-EXT-STS:task_state - OS-EXT-STS:vm_state: OS-EXT-STS:vm_state - - os-extended-volumes:volumes_attached: os-extended-volumes:volumes_attached - OS-SRV-USG:launched_at: OS-SRV-USG:launched_at - OS-SRV-USG:terminated_at: OS-SRV-USG:terminated_at - progress: progress