Merge "Fixed request/response parameters in doc"

This commit is contained in:
Jenkins 2016-09-15 20:22:34 +00:00 committed by Gerrit Code Review
commit 37be83c58d
4 changed files with 40 additions and 15 deletions

View File

@ -69,14 +69,23 @@ Request
.. rest_parameters:: parameters.yaml .. rest_parameters:: parameters.yaml
- status: status - description: description_6
- user_id: user_id
- description: description
- availability_zone: availability_zone - availability_zone: availability_zone
- volume_types: volume_types_2
- name: name_15
Response
--------
.. rest_parameters:: parameters.yaml
- status: status_1
- description: description_11
- availability_zone: availability_zone
- created_at: created_at
- volume_types: volume_types - volume_types: volume_types
- project_id: project_id - name: name_15
- name: name - id: consistencygroup_id_1
- tenant_id: tenant_id
Request Example Request Example
--------------- ---------------
@ -84,6 +93,11 @@ Request Example
.. literalinclude:: ./samples/consistency-group-create-request.json .. literalinclude:: ./samples/consistency-group-create-request.json
:language: javascript :language: javascript
Response Example
----------------
.. literalinclude:: ./samples/consistency-group-create-response.json
:language: javascript
Show consistency group details Show consistency group details
============================== ==============================

View File

@ -1600,6 +1600,18 @@ volume_types:
in: body in: body
required: true required: true
type: array type: array
volume_types_2:
description: |
The list of volume types separated by commas. In an environment with
multiple-storage back ends, the scheduler determines where to send
the volume based on the volume type. For information about how to
use volume types to create multiple-storage back ends, see
`Configure multiple-storage back ends
<http://docs.openstack.org/admin-
guide/blockstorage_multi_backend.html>`_.
in: body
required: true
type: string
volumes: volumes:
description: | description: |
A list of ``volume`` objects. A list of ``volume`` objects.

View File

@ -2,13 +2,7 @@
"consistencygroup": { "consistencygroup": {
"name": "firstcg", "name": "firstcg",
"description": "first consistency group", "description": "first consistency group",
"volume_types": [ "volume_types": "type1,type2",
"type1", "availability_zone": "az0"
"type2"
],
"user_id": "6f519a48-3183-46cf-a32f-41815f814546",
"project_id": "6f519a48-3183-46cf-a32f-41815f815555",
"availability_zone": "az0",
"status": "creating"
} }
} }

View File

@ -1,6 +1,11 @@
{ {
"consistencygroup": { "consistencygroup": {
"id": "6f519a48-3183-46cf-a32f-41815f816666", "status": "error",
"description": "first consistency group",
"availability_zone": "az0",
"created_at": "2016-08-19T19:32:19.000000",
"volume_types": ["type1", "type2"],
"id": "63d1a274-de38-4384-a97e-475306777027",
"name": "firstcg" "name": "firstcg"
} }
} }