openstack
/
nova
Code Issues Proposed changes

Merge "Change api-site to v2.1 format"

This commit is contained in:
Jenkins 2016-09-08 15:57:36 +00:00 committed by Gerrit Code Review
parent 2a2bb1ec60 7957b910dd
commit b61cb28e98
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api-guide/source/limits.rst
View File

@ -25,7 +25,7 @@ applications.
The regular expression boundary matcher "^" for the rate limit takes The regular expression boundary matcher "^" for the rate limit takes
effect after the root URI path. For example, the regular expression effect after the root URI path. For example, the regular expression
^/servers would match the bolded portion of the following URI: ^/servers would match the bolded portion of the following URI:
https://servers.api.openstack.org/v2/3542812\ **/servers**. https://servers.api.openstack.org/v2.1\ **/servers**.
**Table: Sample rate limits** **Table: Sample rate limits**

8
api-guide/source/links_and_references.rst
View File

@ -86,11 +86,11 @@ following types of link relations are associated with resources:
"links":[ "links":[
{ {
"rel":"self", "rel":"self",
"href":"http://servers.api.openstack.org/v2/1234/servers/52415800-8b69-11e0-9b19-734fcece0043" "href":"http://servers.api.openstack.org/v2.1/servers/52415800-8b69-11e0-9b19-734fcece0043"
}, },
{ {
"rel":"bookmark", "rel":"bookmark",
"href":"http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734fcece0043" "href":"http://servers.api.openstack.org/servers/52415800-8b69-11e0-9b19-734fcece0043"
} }
] ]
} }
@ -108,11 +108,11 @@ following types of link relations are associated with resources:
"links": [ "links": [
{ {
"rel" : "self", "rel" : "self",
"href" : "http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2" "href" : "http://servers.api.openstack.org/v2.1/images/52415800-8b69-11e0-9b19-734f5736d2a2"
}, },
{ {
"rel" : "bookmark", "rel" : "bookmark",
"href" : "http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2" "href" : "http://servers.api.openstack.org/images/52415800-8b69-11e0-9b19-734f5736d2a2"
}, },
{ {
"rel" : "alternate", "rel" : "alternate",

12
api-guide/source/paginated_collections.rst
View File

@ -25,7 +25,7 @@ implementation does not contain ``previous`` links. The last
page in the list does not contain a link to "next" page. The following examples page in the list does not contain a link to "next" page. The following examples
illustrate three pages in a collection of images. The first page was illustrate three pages in a collection of images. The first page was
retrieved through a **GET** to retrieved through a **GET** to
``http://servers.api.openstack.org/v2/1234/servers?limit=1``. In these ``http://servers.api.openstack.org/v2.1/servers?limit=1``. In these
examples, the *``limit``* parameter sets the page size to a single item. examples, the *``limit``* parameter sets the page size to a single item.
Subsequent links honor the initial page size. Thus, a client can follow Subsequent links honor the initial page size. Thus, a client can follow
links to traverse a paginated collection without having to input the links to traverse a paginated collection without having to input the
@ -39,7 +39,7 @@ links to traverse a paginated collection without having to input the
{ {
"servers_links":[ "servers_links":[
{ {
"href":"https://servers.api.openstack.org/v2/1234/servers?limit=1&marker=fc45ace4-3398-447b-8ef9-72a22086d775", "href":"https://servers.api.openstack.org/v2.1/servers?limit=1&marker=fc45ace4-3398-447b-8ef9-72a22086d775",
"rel":"next" "rel":"next"
} }
], ],
@ -48,11 +48,11 @@ links to traverse a paginated collection without having to input the
"id":"fc55acf4-3398-447b-8ef9-72a42086d775", "id":"fc55acf4-3398-447b-8ef9-72a42086d775",
"links":[ "links":[
{ {
"href":"https://servers.api.openstack.org/v2/1234/servers/fc45ace4-3398-447b-8ef9-72a22086d775", "href":"https://servers.api.openstack.org/v2.1/servers/fc45ace4-3398-447b-8ef9-72a22086d775",
"rel":"self" "rel":"self"
}, },
{ {
"href":"https://servers.api.openstack.org/v2/1234/servers/fc45ace4-3398-447b-8ef9-72a22086d775", "href":"https://servers.api.openstack.org/v2.1/servers/fc45ace4-3398-447b-8ef9-72a22086d775",
"rel":"bookmark" "rel":"bookmark"
} }
], ],
@ -91,13 +91,13 @@ keep following the ``next`` link to retrieve the full set of metadata.
"metadata_links": [ "metadata_links": [
{ {
"rel": "next", "rel": "next",
"href": "https://servers.api.openstack.org/v2/1234/servers/fc55acf4-3398-447b-8ef9-72a42086d775/meta?marker=ServiceType" "href": "https://servers.api.openstack.org/v2.1/servers/fc55acf4-3398-447b-8ef9-72a42086d775/meta?marker=ServiceType"
} }
], ],
"links": [ "links": [
{ {
"rel": "self", "rel": "self",
"href": "https://servers.api.openstack.org/v2/1234/servers/fc55acf4-3398-447b-8ef9-72a42086d775" "href": "https://servers.api.openstack.org/v2.1/servers/fc55acf4-3398-447b-8ef9-72a42086d775"
} }
] ]
} }

2
api-guide/source/polling_changes-since_parameter.rst
View File

@ -16,7 +16,7 @@ nothing has changed since the *``changes-since``* time, an empty list is
returned. If data has changed, only the items changed since the returned. If data has changed, only the items changed since the
specified time are returned in the response. For example, performing a specified time are returned in the response. For example, performing a
**GET** against **GET** against
https://api.servers.openstack.org/v2/224532/servers?\ *``changes-since``*\ =2015-01-24T17:08Z https://api.servers.openstack.org/v2.1/servers?\ *``changes-since``*\ =2015-01-24T17:08Z
would list all servers that have changed since Mon, 24 Jan 2015 17:08:00 would list all servers that have changed since Mon, 24 Jan 2015 17:08:00
UTC. UTC.

2
api-guide/source/request_and_response_formats.rst
View File

@ -16,7 +16,7 @@ The example below shows a request body in JSON format:
.. code:: .. code::
POST /v2/010101/servers HTTP/1.1 POST /v2.1/servers HTTP/1.1
Host: servers.api.openstack.org Host: servers.api.openstack.org
X-Auth-Token: eaaafd18-0fed-4b3a-81b4-663c99ec1cbb X-Auth-Token: eaaafd18-0fed-4b3a-81b4-663c99ec1cbb