summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--api-ref/source/os-aggregates.inc58
-rw-r--r--api-ref/source/os-certificates.inc2
-rw-r--r--api-ref/source/os-consoles.inc6
3 files changed, 28 insertions, 38 deletions
diff --git a/api-ref/source/os-aggregates.inc b/api-ref/source/os-aggregates.inc
index 2979684701..efb3b18348 100644
--- a/api-ref/source/os-aggregates.inc
+++ b/api-ref/source/os-aggregates.inc
@@ -31,7 +31,7 @@ Request
**Example Create Aggregate: JSON request**
-.. literalinclude:: ../../doc/api_samples/os-aggregates/aggregate-create-req.json
+.. literalinclude:: ../../doc/api_samples/os-aggregates/aggregate-post-req.json
:language: javascript
Response
@@ -39,7 +39,7 @@ Response
**Example Create Aggregate: JSON response**
-.. literalinclude:: ../../doc/api_samples/os-aggregates/aggregate-create-resp.json
+.. literalinclude:: ../../doc/api_samples/os-aggregates/aggregate-post-resp.json
:language: javascript
List Aggregates
@@ -61,17 +61,12 @@ Request
- tenant_id: tenant_id
-**Example List Aggregates: JSON request**
-
-.. literalinclude:: ../../doc/api_samples/os-aggregates/aggregate-create-req.json
- :language: javascript
-
Response
--------
**Example List Aggregates: JSON response**
-.. literalinclude:: ../../doc/api_samples/os-aggregates/aggregates-list-resp.json
+.. literalinclude:: ../../doc/api_samples/os-aggregates/aggregates-list-get-resp.json
:language: javascript
Show Aggregate Details
@@ -94,17 +89,12 @@ Request
- tenant_id: tenant_id
- aggregate_id: aggregate_id
-**Example Show Aggregate Details: JSON request**
-
-.. literalinclude:: ../../doc/api_samples/os-aggregates/aggregate-create-req.json
- :language: javascript
-
Response
--------
**Example Show Aggregate Details: JSON response**
-.. literalinclude:: ../../doc/api_samples/os-aggregates/aggregate-show-resp.json
+.. literalinclude:: ../../doc/api_samples/os-aggregates/aggregates-get-resp.json
:language: javascript
Delete Aggregate
@@ -152,7 +142,7 @@ Request
**Example Update Aggregate: JSON request**
-.. literalinclude:: ../../doc/api_samples/os-aggregates/aggregate-update-req.json
+.. literalinclude:: ../../doc/api_samples/os-aggregates/aggregate-update-post-req.json
:language: javascript
Response
@@ -160,7 +150,7 @@ Response
**Example Update Aggregate: JSON response**
-.. literalinclude:: ../../doc/api_samples/os-aggregates/aggregate-update-resp.json
+.. literalinclude:: ../../doc/api_samples/os-aggregates/aggregate-update-post-resp.json
:language: javascript
Add Host
@@ -187,7 +177,7 @@ Request
**Example Add Host: JSON request**
-.. literalinclude:: ../../doc/api_samples/os-aggregates/aggregate-add-host-req.json
+.. literalinclude:: ../../doc/api_samples/os-aggregates/aggregate-add-host-post-req.json
:language: javascript
Response
@@ -195,17 +185,17 @@ Response
**Example Add Host: JSON response**
-.. literalinclude:: ../../doc/api_samples/os-aggregates/aggregate-add-host-resp.json
+.. literalinclude:: ../../doc/api_samples/os-aggregates/aggregates-add-host-post-resp.json
:language: javascript
-Create Or Update Aggregate Metadata
-===================================
+Remove Host
+===========
.. rest_method:: POST /v2.1/{tenant_id}/os-aggregates/{aggregate_id}/action
-Creates or replaces metadata for an aggregate.
+Removes a host from an aggregate.
-Specify the ``set_metadata`` action in the request body.
+Specify the ``remove_host`` action in the request body.
Normal response codes: 200
@@ -220,27 +210,27 @@ Request
- tenant_id: tenant_id
- aggregate_id: aggregate_id
-**Example Create Or Update Aggregate Metadata: JSON request**
+**Example Remove Host: JSON request**
-.. literalinclude:: ../../doc/api_samples/os-aggregates/aggregate-metadata-create-req.json
+.. literalinclude:: ../../doc/api_samples/os-aggregates/aggregate-remove-host-post-req.json
:language: javascript
Response
--------
-**Example Create Or Update Aggregate Metadata: JSON response**
+**Example Remove Host: JSON response**
-.. literalinclude:: ../../doc/api_samples/os-aggregates/aggregate-metadata-create-resp.json
+.. literalinclude:: ../../doc/api_samples/os-aggregates/aggregates-remove-host-post-resp.json
:language: javascript
-Remove Host
-===========
+Create Or Update Aggregate Metadata
+===================================
.. rest_method:: POST /v2.1/{tenant_id}/os-aggregates/{aggregate_id}/action
-Removes a host from an aggregate.
+Creates or replaces metadata for an aggregate.
-Specify the ``remove_host`` action in the request body.
+Specify the ``set_metadata`` action in the request body.
Normal response codes: 200
@@ -255,16 +245,16 @@ Request
- tenant_id: tenant_id
- aggregate_id: aggregate_id
-**Example Remove Host: JSON request**
+**Example Create Or Update Aggregate Metadata: JSON request**
-.. literalinclude:: ../../doc/api_samples/os-aggregates/aggregate-remove-host-req.json
+.. literalinclude:: ../../doc/api_samples/os-aggregates/aggregate-metadata-post-req.json
:language: javascript
Response
--------
-**Example Remove Host: JSON response**
+**Example Create Or Update Aggregate Metadata: JSON response**
-.. literalinclude:: ../../doc/api_samples/os-aggregates/aggregate-remove-host-resp.json
+.. literalinclude:: ../../doc/api_samples/os-aggregates/aggregates-metadata-post-resp.json
:language: javascript
diff --git a/api-ref/source/os-certificates.inc b/api-ref/source/os-certificates.inc
index de9f4aae84..da2bf9ff30 100644
--- a/api-ref/source/os-certificates.inc
+++ b/api-ref/source/os-certificates.inc
@@ -58,6 +58,6 @@ Response
**Example Show Certificate Details: JSON response**
-.. literalinclude:: ../../doc/api_samples/os-certificates/certificate-show-root-resp.json
+.. literalinclude:: ../../doc/api_samples/os-certificates/certificate-get-root-resp.json
:language: javascript
diff --git a/api-ref/source/os-consoles.inc b/api-ref/source/os-consoles.inc
index 9168eef016..11420d8c8c 100644
--- a/api-ref/source/os-consoles.inc
+++ b/api-ref/source/os-consoles.inc
@@ -54,7 +54,7 @@ Response
**Example List consoles: JSON response**
-.. literalinclude:: ../../doc/api_samples/os-consoles/consoles-list-resp.json
+.. literalinclude:: ../../doc/api_samples/os-consoles/consoles-list-get-resp.json
:language: javascript
Show Console Details
@@ -83,7 +83,7 @@ Response
**Example List consoles: JSON response**
-.. literalinclude:: ../../doc/api_samples/os-consoles/consoles-list-resp.json
+.. literalinclude:: ../../doc/api_samples/os-consoles/consoles-get-resp.json
:language: javascript
Delete Console
@@ -137,6 +137,6 @@ Response
**Example List consoles: JSON response**
-.. literalinclude:: ../../doc/api_samples/os-consoles/console-auth-show-resp.json
+.. literalinclude:: ../../doc/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.json
:language: javascript