summaryrefslogtreecommitdiff
path: root/placement-api-ref
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-12-01 01:42:27 +0000
committerGerrit Code Review <review@openstack.org>2017-12-01 01:42:27 +0000
commite1499c6ecccb5525952f7fec133126403b86d842 (patch)
tree275dee49aed3c239ce794b496ece3856cf1316e7 /placement-api-ref
parentd4b6b248b941913ec2512e75b459240e5489000b (diff)
parent0965e7ae6e17c4413571792c7e3a13e8f11400d6 (diff)
downloadnova-e1499c6ecccb5525952f7fec133126403b86d842.tar.gz
Merge "[placement] Fix parameter order in placement API ref"
Diffstat (limited to 'placement-api-ref')
-rw-r--r--placement-api-ref/source/inventories.inc2
-rw-r--r--placement-api-ref/source/inventory.inc2
-rw-r--r--placement-api-ref/source/resource_providers.inc6
3 files changed, 5 insertions, 5 deletions
diff --git a/placement-api-ref/source/inventories.inc b/placement-api-ref/source/inventories.inc
index a62c0d05da..cfbba286e7 100644
--- a/placement-api-ref/source/inventories.inc
+++ b/placement-api-ref/source/inventories.inc
@@ -62,12 +62,12 @@ Request
- uuid: resource_provider_uuid_path
- resource_provider_generation: resource_provider_generation
- inventories: inventories
+ - total: total
- allocation_ratio: allocation_ratio_opt
- max_unit: max_unit_opt
- min_unit: min_unit_opt
- reserved: reserved_opt
- step_size: step_size_opt
- - total: total
Request example
---------------
diff --git a/placement-api-ref/source/inventory.inc b/placement-api-ref/source/inventory.inc
index c9b024eeb0..fa8f6c6f8f 100644
--- a/placement-api-ref/source/inventory.inc
+++ b/placement-api-ref/source/inventory.inc
@@ -63,12 +63,12 @@ Request
- uuid: resource_provider_uuid_path
- resource_class: resource_class_path
- resource_provider_generation: resource_provider_generation
+ - total: total
- allocation_ratio: allocation_ratio_opt
- max_unit: max_unit_opt
- min_unit: min_unit_opt
- reserved: reserved_opt
- step_size: step_size_opt
- - total: total
Request example
---------------
diff --git a/placement-api-ref/source/resource_providers.inc b/placement-api-ref/source/resource_providers.inc
index 235917847b..b0bdc5ff5c 100644
--- a/placement-api-ref/source/resource_providers.inc
+++ b/placement-api-ref/source/resource_providers.inc
@@ -24,10 +24,10 @@ of all filters are merged with a boolean `AND`.
.. rest_parameters:: parameters.yaml
- - resources: resources_query
- - member_of: member_of
- - uuid: resource_provider_uuid_query
- name: resource_provider_name_query
+ - uuid: resource_provider_uuid_query
+ - member_of: member_of
+ - resources: resources_query
Response
--------