openstack/nova
Code Issues Proposed changes

Merge "Correct sort_key and sort_dir parameter for flavor"

Browse Source
This commit is contained in:
Jenkins
2016-09-13 20:33:34 +00:00
committed by Gerrit Code Review
parent 3c6b71d311 d7948387b1
commit 7e8fbabf45
3 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api-ref/source/flavors.inc
View File

@@ -26,8 +26,8 @@ Request
.. rest_parameters:: parameters.yaml .. rest_parameters:: parameters.yaml
- sort_key: sort_key - sort_key: sort_key_flavor
- sort_dir: sort_dir - sort_dir: sort_dir_flavor
- limit: limit - limit: limit
- marker: marker - marker: marker
- minDisk: minDisk - minDisk: minDisk
@@ -128,8 +128,8 @@ Request
.. rest_parameters:: parameters.yaml .. rest_parameters:: parameters.yaml
- sort_key: sort_key - sort_key: sort_key_flavor
- sort_dir: sort_dir - sort_dir: sort_dir_flavor
- limit: limit - limit: limit
- marker: marker - marker: marker
- minDisk: minDisk - minDisk: minDisk

22
api-ref/source/parameters.yaml
View File

@@ -651,7 +651,16 @@ server_status_query:
in: query in: query
required: false required: false
type: string type: string
sort_dir: sort_dir_flavor:
description: |
Sort direction. A valid value is ``asc`` (ascending) or ``desc`` (descending).
Default is ``asc``. You can specify multiple pairs of sort key and sort direction
query parameters. If you omit the sort direction in a pair, the API uses the natural
sorting direction of the direction of the flavor ``sort_key`` attribute.
in: query
required: false
type: string
sort_dir_server:
description: | description: |
Sort direction. A valid value is ``asc`` (ascending) or ``desc`` (descending). Sort direction. A valid value is ``asc`` (ascending) or ``desc`` (descending).
Default is ``desc``. You can specify multiple pairs of sort key and sort direction Default is ``desc``. You can specify multiple pairs of sort key and sort direction
@@ -660,7 +669,16 @@ sort_dir:
in: query in: query
required: false required: false
type: string type: string
sort_key: sort_key_flavor:
description: |
Sorts by a flavor attribute. Default attribute is ``flavorid``. You can specify
multiple pairs of sort key and sort direction query parameters. If you omit the
sort direction in a pair, the API uses the natural sorting direction of the flavor
``sort_key`` attribute.
in: query
required: false
type: string
sort_key_server:
description: | description: |
Sorts by a server attribute. Default attribute is ``created``. You can specify Sorts by a server attribute. Default attribute is ``created``. You can specify
multiple pairs of sort key and sort direction query parameters. If you omit the multiple pairs of sort key and sort direction query parameters. If you omit the

8
api-ref/source/servers.inc
View File

@@ -159,8 +159,8 @@ Request
- limit: limit - limit: limit
- marker: marker - marker: marker
- sort_key: sort_key - sort_key: sort_key_server
- sort_dir: sort_dir - sort_dir: sort_dir_server
- changes-since: changes_since_server - changes-since: changes_since_server
- image: image_query - image: image_query
- flavor: flavor_query - flavor: flavor_query
@@ -462,8 +462,8 @@ Request
- limit: limit - limit: limit
- marker: marker - marker: marker
- sort_key: sort_key - sort_key: sort_key_server
- sort_dir: sort_dir - sort_dir: sort_dir_server
- changes-since: changes_since_server - changes-since: changes_since_server
- image: image_query - image: image_query
- flavor: flavor_query - flavor: flavor_query