diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-19 22:10:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-19 22:10:18 +0000 |
| commit | 539c3d417c97cc007248473ca0a052f392d1eb19 (patch) | |
| tree | 18d134cb7151ee666492e6798bff199b2425f616 /api-ref | |
| parent | 96164086f78f788f47f7b2802a9d5c607065e1cf (diff) | |
| parent | 5ec9a62f4db57eb6ae86704bb987a83a8b0c6faa (diff) | |
| download | swift-539c3d417c97cc007248473ca0a052f392d1eb19.tar.gz | |
Merge "api-ref: clean up account listing examples"
Diffstat (limited to 'api-ref')
3 files changed, 17 insertions, 39 deletions
diff --git a/api-ref/source/samples/account-containers-list-http-request-json.txt b/api-ref/source/samples/account-containers-list-http-request-json.txt index a4b315556..137ee93fb 100644 --- a/api-ref/source/samples/account-containers-list-http-request-json.txt +++ b/api-ref/source/samples/account-containers-list-http-request-json.txt @@ -1 +1 @@ -curl -i https://23.253.72.207/v1/$account?format=json -X GET -H "X-Auth-Token: $token"
\ No newline at end of file +curl -i $publicURL?format=json -X GET -H "X-Auth-Token: $token" diff --git a/api-ref/source/samples/account-containers-list-http-request-xml.txt b/api-ref/source/samples/account-containers-list-http-request-xml.txt index cf255617f..6f9293fdc 100644 --- a/api-ref/source/samples/account-containers-list-http-request-xml.txt +++ b/api-ref/source/samples/account-containers-list-http-request-xml.txt @@ -1,2 +1 @@ -curl -i https://23.253.72.207/v1/$account?format=xml \ - -X GET -H "X-Auth-Token: $token"
\ No newline at end of file +curl -i $publicURL?format=xml -X GET -H "X-Auth-Token: $token" diff --git a/api-ref/source/storage-account-services.inc b/api-ref/source/storage-account-services.inc index 1f27c042a..86bebf775 100644 --- a/api-ref/source/storage-account-services.inc +++ b/api-ref/source/storage-account-services.inc @@ -24,23 +24,6 @@ using the SQLite memcmp() function, regardless of text encoding. See `Collating Sequences <http://www.sqlite.org/datatype3.html#collation>`_. -Example requests and responses: - -- Show account details and list containers and ask for a JSON - response: - - :: - - curl -i $publicURL?format=json -X GET -H "X-Auth-Token: $token" - - -- List containers and ask for an XML response: - - :: - - curl -i $publicURL?format=xml -X GET -H "X-Auth-Token: $token" - - The response body returns a list of containers. The default response (``text/plain``) returns one container per line. @@ -56,6 +39,21 @@ is text, JSON, or XML. For a text response, you get a 204 , because there is no content. However, for a JSON or XML response, you get a 200 with content indicating an empty array. +Example requests and responses: + +- Show account details and list containers and ask for a JSON + response: + + .. literalinclude:: samples/account-containers-list-http-request-json.txt + .. literalinclude:: samples/account-containers-list-http-response-json.txt + .. literalinclude:: samples/account-containers-list-response.json + +- Show account details and list containers and ask for an XML response: + + .. literalinclude:: samples/account-containers-list-http-request-xml.txt + .. literalinclude:: samples/account-containers-list-http-response-xml.txt + .. literalinclude:: samples/account-containers-list-response.xml + If the request succeeds, the operation returns one of these status codes: @@ -116,22 +114,6 @@ Response Parameters - name: name - -Response Example format=json ----------------------------- - -.. literalinclude:: samples/account-containers-list-http-response-json.txt -.. literalinclude:: samples/account-containers-list-response.json - - -Response Example format=xml ---------------------------- - -.. literalinclude:: samples/account-containers-list-http-response-xml.txt -.. literalinclude:: samples/account-containers-list-response.xml - - - Create, update, or delete account metadata ========================================== @@ -286,9 +268,6 @@ Response Parameters - X-Trans-Id: X-Trans-Id - - - Show account metadata ===================== |