diff options
author | Chris Yeoh <cyeoh@au1.ibm.com> | 2013-08-22 18:32:53 +0930 |
---|---|---|
committer | Chris Yeoh <cyeoh@au1.ibm.com> | 2013-09-03 13:47:40 +0930 |
commit | 350d6f533753c82099bc33156ece095bc5670372 (patch) | |
tree | 079f57a6c761db0641e6a81674b33fb2df03ba59 /doc/v3 | |
parent | 8b5f0c9bee65c287e85ceb2b53918f7a3b23071a (diff) | |
download | nova-350d6f533753c82099bc33156ece095bc5670372.tar.gz |
Makes v3 API keypairs extension core
Adds os-keypairs to the core list for the V3 API.
Rename os-keypairs to keypairs as part of this change.
Fixes some incorrect urls in test_keypairs which still included
the tenant id
Updates api samples for servers since keypairs is now core and forms
part of the response by default
+DocImpact
Partially implements blueprint nova-v3-api
Change-Id: I8cdf52be0c8b19f7704848029a78373da8018cab
Diffstat (limited to 'doc/v3')
-rw-r--r-- | doc/v3/api_samples/servers/server-get-resp.json | 13 | ||||
-rw-r--r-- | doc/v3/api_samples/servers/server-get-resp.xml | 6 | ||||
-rw-r--r-- | doc/v3/api_samples/servers/server-post-resp.json | 8 | ||||
-rw-r--r-- | doc/v3/api_samples/servers/server-post-resp.xml | 6 | ||||
-rw-r--r-- | doc/v3/api_samples/servers/servers-details-resp.json | 13 | ||||
-rw-r--r-- | doc/v3/api_samples/servers/servers-details-resp.xml | 6 | ||||
-rw-r--r-- | doc/v3/api_samples/servers/servers-list-resp.json | 6 | ||||
-rw-r--r-- | doc/v3/api_samples/servers/servers-list-resp.xml | 6 |
8 files changed, 33 insertions, 31 deletions
diff --git a/doc/v3/api_samples/servers/server-get-resp.json b/doc/v3/api_samples/servers/server-get-resp.json index 408915b1cb..b7bbfa031f 100644 --- a/doc/v3/api_samples/servers/server-get-resp.json +++ b/doc/v3/api_samples/servers/server-get-resp.json @@ -12,7 +12,7 @@ } ] }, - "created": "2013-08-27T00:21:41Z", + "created": "2013-09-03T04:01:32Z", "flavor": { "id": "1", "links": [ @@ -22,8 +22,8 @@ } ] }, - "host_id": "89429d40116cdb1f85f09de69dbc250f040a62db4a20e08b730b88c5", - "id": "5c2f3a9d-1858-454d-b2a2-ac2e93036d16", + "host_id": "92154fab69d5883ba2c8622b7e65f745dd33257221c07af363c51b29", + "id": "0e44cc9c-e052-415d-afbf-469b0d384170", "image": { "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ @@ -33,13 +33,14 @@ } ] }, + "key_name": null, "links": [ { - "href": "http://openstack.example.com/v3/servers/5c2f3a9d-1858-454d-b2a2-ac2e93036d16", + "href": "http://openstack.example.com/v3/servers/0e44cc9c-e052-415d-afbf-469b0d384170", "rel": "self" }, { - "href": "http://openstack.example.com/servers/5c2f3a9d-1858-454d-b2a2-ac2e93036d16", + "href": "http://openstack.example.com/servers/0e44cc9c-e052-415d-afbf-469b0d384170", "rel": "bookmark" } ], @@ -50,7 +51,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "2013-08-27T00:21:41Z", + "updated": "2013-09-03T04:01:33Z", "user_id": "fake" } }
\ No newline at end of file diff --git a/doc/v3/api_samples/servers/server-get-resp.xml b/doc/v3/api_samples/servers/server-get-resp.xml index c40b8f8325..437132be18 100644 --- a/doc/v3/api_samples/servers/server-get-resp.xml +++ b/doc/v3/api_samples/servers/server-get-resp.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> -<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-08-27T00:27:57Z" user_id="fake" name="new-server-test" created="2013-08-27T00:27:57Z" tenant_id="openstack" access_ip_v4="" progress="0" host_id="043dfed1b17e67d9eacf15337bb912cea5d1bda2dc3af0edda9fd1a3" id="3a39932d-11e8-485d-8bb5-5e41b87a4e64" access_ip_v6=""> +<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-09-03T04:01:33Z" user_id="fake" name="new-server-test" created="2013-09-03T04:01:33Z" tenant_id="openstack" access_ip_v4="" progress="0" host_id="4fc6224a1e5d689f858d087c5ff6d24def5eab35646b53c3454d1234" id="f07e01fa-ed8f-4084-99b6-9311e6956e70" access_ip_v6="" key_name="None"> <image id="70a599e0-31e7-49b7-b260-868f441e862b"> <atom:link href="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/> </image> @@ -14,6 +14,6 @@ <ip version="4" type="fixed" addr="192.168.0.3" mac_addr="aa:bb:cc:dd:ee:ff"/> </network> </addresses> - <atom:link href="http://openstack.example.com/v3/servers/3a39932d-11e8-485d-8bb5-5e41b87a4e64" rel="self"/> - <atom:link href="http://openstack.example.com/servers/3a39932d-11e8-485d-8bb5-5e41b87a4e64" rel="bookmark"/> + <atom:link href="http://openstack.example.com/v3/servers/f07e01fa-ed8f-4084-99b6-9311e6956e70" rel="self"/> + <atom:link href="http://openstack.example.com/servers/f07e01fa-ed8f-4084-99b6-9311e6956e70" rel="bookmark"/> </server>
\ No newline at end of file diff --git a/doc/v3/api_samples/servers/server-post-resp.json b/doc/v3/api_samples/servers/server-post-resp.json index 7be48ad56c..1c6feaa0bd 100644 --- a/doc/v3/api_samples/servers/server-post-resp.json +++ b/doc/v3/api_samples/servers/server-post-resp.json @@ -1,14 +1,14 @@ { "server": { - "admin_pass": "2pXrV3mMFkxH", - "id": "f85df75c-cf69-4723-b861-deff54b7cf70", + "admin_pass": "6NpUwoz2QDRN", + "id": "f5dc173b-6804-445a-a6d8-c705dad5b5eb", "links": [ { - "href": "http://openstack.example.com/v3/servers/f85df75c-cf69-4723-b861-deff54b7cf70", + "href": "http://openstack.example.com/v3/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", "rel": "self" }, { - "href": "http://openstack.example.com/servers/f85df75c-cf69-4723-b861-deff54b7cf70", + "href": "http://openstack.example.com/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", "rel": "bookmark" } ] diff --git a/doc/v3/api_samples/servers/server-post-resp.xml b/doc/v3/api_samples/servers/server-post-resp.xml index f5c7a8713c..d88145f6a2 100644 --- a/doc/v3/api_samples/servers/server-post-resp.xml +++ b/doc/v3/api_samples/servers/server-post-resp.xml @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> -<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="6d896124-8af0-4f2b-a033-e8ca22f83810" admin_pass="JqCn8mtbDnj3"> +<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="b7244821-09f6-4931-a59f-433bc9a00edc" admin_pass="qvVB4ayUcia8"> <metadata/> - <atom:link href="http://openstack.example.com/v3/servers/6d896124-8af0-4f2b-a033-e8ca22f83810" rel="self"/> - <atom:link href="http://openstack.example.com/servers/6d896124-8af0-4f2b-a033-e8ca22f83810" rel="bookmark"/> + <atom:link href="http://openstack.example.com/v3/servers/b7244821-09f6-4931-a59f-433bc9a00edc" rel="self"/> + <atom:link href="http://openstack.example.com/servers/b7244821-09f6-4931-a59f-433bc9a00edc" rel="bookmark"/> </server>
\ No newline at end of file diff --git a/doc/v3/api_samples/servers/servers-details-resp.json b/doc/v3/api_samples/servers/servers-details-resp.json index 1487ae729d..07995f2b75 100644 --- a/doc/v3/api_samples/servers/servers-details-resp.json +++ b/doc/v3/api_samples/servers/servers-details-resp.json @@ -13,7 +13,7 @@ } ] }, - "created": "2013-08-27T00:34:14Z", + "created": "2013-09-03T04:01:32Z", "flavor": { "id": "1", "links": [ @@ -23,8 +23,8 @@ } ] }, - "host_id": "3da3b81edf53783e31c0bb9292c85b478943a79528028ed642c46c57", - "id": "aa830ba3-7562-44c4-b794-6e1678402854", + "host_id": "bcf92836fc9ed4203a75cb0337afc7f917d2be504164b995c2334b25", + "id": "f5dc173b-6804-445a-a6d8-c705dad5b5eb", "image": { "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ @@ -34,13 +34,14 @@ } ] }, + "key_name": null, "links": [ { - "href": "http://openstack.example.com/v3/servers/aa830ba3-7562-44c4-b794-6e1678402854", + "href": "http://openstack.example.com/v3/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", "rel": "self" }, { - "href": "http://openstack.example.com/servers/aa830ba3-7562-44c4-b794-6e1678402854", + "href": "http://openstack.example.com/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", "rel": "bookmark" } ], @@ -51,7 +52,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "2013-08-27T00:34:14Z", + "updated": "2013-09-03T04:01:32Z", "user_id": "fake" } ] diff --git a/doc/v3/api_samples/servers/servers-details-resp.xml b/doc/v3/api_samples/servers/servers-details-resp.xml index fab520299e..5a89018f2a 100644 --- a/doc/v3/api_samples/servers/servers-details-resp.xml +++ b/doc/v3/api_samples/servers/servers-details-resp.xml @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <servers xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1"> - <server status="ACTIVE" updated="2013-08-27T00:34:16Z" user_id="fake" name="new-server-test" created="2013-08-27T00:34:16Z" tenant_id="openstack" access_ip_v4="" progress="0" host_id="cf19fcc5d5d7a9ff7fb80da2db424218bc28b5b360705b97b8afaef3" id="43980ac6-fa88-44fc-b65d-87da4fa6f800" access_ip_v6=""> + <server status="ACTIVE" updated="2013-09-03T04:01:34Z" user_id="fake" name="new-server-test" created="2013-09-03T04:01:33Z" tenant_id="openstack" access_ip_v4="" progress="0" host_id="9afcaa50605be561503e2d707aed0c219081dc8a87d7f67a965512c8" id="3af51aa7-a2aa-477b-9499-e5528bcf32a5" access_ip_v6="" key_name="None"> <image id="70a599e0-31e7-49b7-b260-868f441e862b"> <atom:link href="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/> </image> @@ -15,7 +15,7 @@ <ip version="4" type="fixed" addr="192.168.0.3" mac_addr="aa:bb:cc:dd:ee:ff"/> </network> </addresses> - <atom:link href="http://openstack.example.com/v3/servers/43980ac6-fa88-44fc-b65d-87da4fa6f800" rel="self"/> - <atom:link href="http://openstack.example.com/servers/43980ac6-fa88-44fc-b65d-87da4fa6f800" rel="bookmark"/> + <atom:link href="http://openstack.example.com/v3/servers/3af51aa7-a2aa-477b-9499-e5528bcf32a5" rel="self"/> + <atom:link href="http://openstack.example.com/servers/3af51aa7-a2aa-477b-9499-e5528bcf32a5" rel="bookmark"/> </server> </servers>
\ No newline at end of file diff --git a/doc/v3/api_samples/servers/servers-list-resp.json b/doc/v3/api_samples/servers/servers-list-resp.json index dcef4422f7..9cb57a7209 100644 --- a/doc/v3/api_samples/servers/servers-list-resp.json +++ b/doc/v3/api_samples/servers/servers-list-resp.json @@ -1,14 +1,14 @@ { "servers": [ { - "id": "204da46b-4fc9-4761-9bab-aa28add417e6", + "id": "22c91117-08de-4894-9aa9-6ef382400985", "links": [ { - "href": "http://openstack.example.com/v3/servers/204da46b-4fc9-4761-9bab-aa28add417e6", + "href": "http://openstack.example.com/v3/servers/22c91117-08de-4894-9aa9-6ef382400985", "rel": "self" }, { - "href": "http://openstack.example.com/servers/204da46b-4fc9-4761-9bab-aa28add417e6", + "href": "http://openstack.example.com/servers/22c91117-08de-4894-9aa9-6ef382400985", "rel": "bookmark" } ], diff --git a/doc/v3/api_samples/servers/servers-list-resp.xml b/doc/v3/api_samples/servers/servers-list-resp.xml index 1c9d406347..337f0525fb 100644 --- a/doc/v3/api_samples/servers/servers-list-resp.xml +++ b/doc/v3/api_samples/servers/servers-list-resp.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <servers xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1"> - <server name="new-server-test" id="6d896124-8af0-4f2b-a033-e8ca22f83810"> - <atom:link href="http://openstack.example.com/v3/servers/6d896124-8af0-4f2b-a033-e8ca22f83810" rel="self"/> - <atom:link href="http://openstack.example.com/servers/6d896124-8af0-4f2b-a033-e8ca22f83810" rel="bookmark"/> + <server name="new-server-test" id="b7244821-09f6-4931-a59f-433bc9a00edc"> + <atom:link href="http://openstack.example.com/v3/servers/b7244821-09f6-4931-a59f-433bc9a00edc" rel="self"/> + <atom:link href="http://openstack.example.com/servers/b7244821-09f6-4931-a59f-433bc9a00edc" rel="bookmark"/> </server> </servers>
\ No newline at end of file |