From 0d813e44ff126640ffbc4f915be5b2fa203c7811 Mon Sep 17 00:00:00 2001 From: gtt116 Date: Wed, 28 Nov 2012 11:11:26 +0800 Subject: Add REST API to show availability_zone of instance. Implement one workitem for bp:show-availability-zone This show the availability zone and availability zone of its host in API: GET /servers/details, GET /server/{uuid}. When create instance if "availability_zone" doesn't specified, the "availability_zone" of the instance will be None. But actually the instance is in a zone which its host is in. So I think show both of them will be fine. Change-Id: I2d742ee2d291b514bf783fa79293785cca8ea2a5 --- doc/api_samples/OS-EXT-AZ/server-get-resp.json | 56 +++++++++++++++++++++ doc/api_samples/OS-EXT-AZ/server-get-resp.xml | 19 +++++++ doc/api_samples/OS-EXT-AZ/server-post-req.json | 16 ++++++ doc/api_samples/OS-EXT-AZ/server-post-req.xml | 6 +++ doc/api_samples/OS-EXT-AZ/server-post-resp.json | 16 ++++++ doc/api_samples/OS-EXT-AZ/server-post-resp.xml | 6 +++ doc/api_samples/OS-EXT-AZ/servers-detail-resp.json | 58 ++++++++++++++++++++++ doc/api_samples/OS-EXT-AZ/servers-detail-resp.xml | 21 ++++++++ .../all_extensions/extensions-get-resp.json | 8 +++ .../all_extensions/extensions-get-resp.xml | 3 ++ .../all_extensions/server-get-resp.json | 16 +++--- doc/api_samples/all_extensions/server-get-resp.xml | 6 +-- .../all_extensions/servers-details-resp.json | 16 +++--- .../all_extensions/servers-details-resp.xml | 8 +-- 14 files changed, 234 insertions(+), 21 deletions(-) create mode 100644 doc/api_samples/OS-EXT-AZ/server-get-resp.json create mode 100644 doc/api_samples/OS-EXT-AZ/server-get-resp.xml create mode 100644 doc/api_samples/OS-EXT-AZ/server-post-req.json create mode 100644 doc/api_samples/OS-EXT-AZ/server-post-req.xml create mode 100644 doc/api_samples/OS-EXT-AZ/server-post-resp.json create mode 100644 doc/api_samples/OS-EXT-AZ/server-post-resp.xml create mode 100644 doc/api_samples/OS-EXT-AZ/servers-detail-resp.json create mode 100644 doc/api_samples/OS-EXT-AZ/servers-detail-resp.xml (limited to 'doc') diff --git a/doc/api_samples/OS-EXT-AZ/server-get-resp.json b/doc/api_samples/OS-EXT-AZ/server-get-resp.json new file mode 100644 index 000000000..a7cf031ef --- /dev/null +++ b/doc/api_samples/OS-EXT-AZ/server-get-resp.json @@ -0,0 +1,56 @@ +{ + "server": { + "OS-EXT-AZ:availability_zone": null, + "OS-EXT-AZ:host_availability_zone": "nova", + "accessIPv4": "", + "accessIPv6": "", + "addresses": { + "private": [ + { + "addr": "192.168.0.3", + "version": 4 + } + ] + }, + "created": "2013-01-30T13:38:47Z", + "flavor": { + "id": "1", + "links": [ + { + "href": "http://openstack.example.com/openstack/flavors/1", + "rel": "bookmark" + } + ] + }, + "hostId": "d38ea49a033b0efaf80c165de63f4805c886dfb94dc0fe731227eccb", + "id": "fb7babfd-e1a1-4add-90e6-3558180983c7", + "image": { + "id": "70a599e0-31e7-49b7-b260-868f441e862b", + "links": [ + { + "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "bookmark" + } + ] + }, + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/servers/fb7babfd-e1a1-4add-90e6-3558180983c7", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/servers/fb7babfd-e1a1-4add-90e6-3558180983c7", + "rel": "bookmark" + } + ], + "metadata": { + "My Server Name": "Apache1" + }, + "name": "new-server-test", + "progress": 0, + "status": "ACTIVE", + "tenant_id": "openstack", + "updated": "2013-01-30T13:38:49Z", + "user_id": "fake" + } +} \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-AZ/server-get-resp.xml b/doc/api_samples/OS-EXT-AZ/server-get-resp.xml new file mode 100644 index 000000000..7a6edf057 --- /dev/null +++ b/doc/api_samples/OS-EXT-AZ/server-get-resp.xml @@ -0,0 +1,19 @@ + + + + + + + + + + Apache1 + + + + + + + + + \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-AZ/server-post-req.json b/doc/api_samples/OS-EXT-AZ/server-post-req.json new file mode 100644 index 000000000..d88eb4122 --- /dev/null +++ b/doc/api_samples/OS-EXT-AZ/server-post-req.json @@ -0,0 +1,16 @@ +{ + "server" : { + "name" : "new-server-test", + "imageRef" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "flavorRef" : "http://openstack.example.com/openstack/flavors/1", + "metadata" : { + "My Server Name" : "Apache1" + }, + "personality" : [ + { + "path" : "/etc/banner.txt", + "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA==" + } + ] + } +} \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-AZ/server-post-req.xml b/doc/api_samples/OS-EXT-AZ/server-post-req.xml new file mode 100644 index 000000000..68f0933c7 --- /dev/null +++ b/doc/api_samples/OS-EXT-AZ/server-post-req.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/doc/api_samples/OS-EXT-AZ/server-post-resp.json b/doc/api_samples/OS-EXT-AZ/server-post-resp.json new file mode 100644 index 000000000..76a723f87 --- /dev/null +++ b/doc/api_samples/OS-EXT-AZ/server-post-resp.json @@ -0,0 +1,16 @@ +{ + "server": { + "adminPass": "MgXXGVx9ctdF", + "id": "75a88708-cecb-459c-8c3d-b7c93e67edbe", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/servers/75a88708-cecb-459c-8c3d-b7c93e67edbe", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/servers/75a88708-cecb-459c-8c3d-b7c93e67edbe", + "rel": "bookmark" + } + ] + } +} \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-AZ/server-post-resp.xml b/doc/api_samples/OS-EXT-AZ/server-post-resp.xml new file mode 100644 index 000000000..d8b1f0837 --- /dev/null +++ b/doc/api_samples/OS-EXT-AZ/server-post-resp.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-AZ/servers-detail-resp.json b/doc/api_samples/OS-EXT-AZ/servers-detail-resp.json new file mode 100644 index 000000000..5fab02ac0 --- /dev/null +++ b/doc/api_samples/OS-EXT-AZ/servers-detail-resp.json @@ -0,0 +1,58 @@ +{ + "servers": [ + { + "OS-EXT-AZ:availability_zone": null, + "OS-EXT-AZ:host_availability_zone": "nova", + "accessIPv4": "", + "accessIPv6": "", + "addresses": { + "private": [ + { + "addr": "192.168.0.3", + "version": 4 + } + ] + }, + "created": "2013-01-30T13:26:51Z", + "flavor": { + "id": "1", + "links": [ + { + "href": "http://openstack.example.com/openstack/flavors/1", + "rel": "bookmark" + } + ] + }, + "hostId": "60c988a84401fa15888a32833e5848e9caa99a45778310ba7b363165", + "id": "3dbf5b00-dabc-41ff-b6ab-4409568fae9d", + "image": { + "id": "70a599e0-31e7-49b7-b260-868f441e862b", + "links": [ + { + "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "bookmark" + } + ] + }, + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/servers/3dbf5b00-dabc-41ff-b6ab-4409568fae9d", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/servers/3dbf5b00-dabc-41ff-b6ab-4409568fae9d", + "rel": "bookmark" + } + ], + "metadata": { + "My Server Name": "Apache1" + }, + "name": "new-server-test", + "progress": 0, + "status": "ACTIVE", + "tenant_id": "openstack", + "updated": "2013-01-30T13:26:52Z", + "user_id": "fake" + } + ] +} \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-AZ/servers-detail-resp.xml b/doc/api_samples/OS-EXT-AZ/servers-detail-resp.xml new file mode 100644 index 000000000..4f1f311a8 --- /dev/null +++ b/doc/api_samples/OS-EXT-AZ/servers-detail-resp.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + Apache1 + + + + + + + + + + \ No newline at end of file diff --git a/doc/api_samples/all_extensions/extensions-get-resp.json b/doc/api_samples/all_extensions/extensions-get-resp.json index 604ad6763..3cb31fc2d 100644 --- a/doc/api_samples/all_extensions/extensions-get-resp.json +++ b/doc/api_samples/all_extensions/extensions-get-resp.json @@ -16,6 +16,14 @@ "namespace": "http://docs.openstack.org/compute/ext/disk_config/api/v1.1", "updated": "2011-09-27T00:00:00+00:00" }, + { + "alias": "OS-EXT-AZ", + "description": "Extended Server Attributes support.", + "links": [], + "name": "ExtendedAvailabilityZone", + "namespace": "http://docs.openstack.org/compute/ext/extended_availability_zone/api/v2", + "updated": "2013-01-30T00:00:00+00:00" + }, { "alias": "OS-EXT-SRV-ATTR", "description": "Extended Server Attributes support.", diff --git a/doc/api_samples/all_extensions/extensions-get-resp.xml b/doc/api_samples/all_extensions/extensions-get-resp.xml index d7f483745..8b0b218aa 100644 --- a/doc/api_samples/all_extensions/extensions-get-resp.xml +++ b/doc/api_samples/all_extensions/extensions-get-resp.xml @@ -6,6 +6,9 @@ Disk Management Extension. + + Extended Server Attributes support. + Extended Server Attributes support. diff --git a/doc/api_samples/all_extensions/server-get-resp.json b/doc/api_samples/all_extensions/server-get-resp.json index a174bd779..56feee209 100644 --- a/doc/api_samples/all_extensions/server-get-resp.json +++ b/doc/api_samples/all_extensions/server-get-resp.json @@ -1,7 +1,9 @@ { "server": { "OS-DCF:diskConfig": "AUTO", - "OS-EXT-SRV-ATTR:host": "543330fc7412414094e79c867798cefd", + "OS-EXT-AZ:availability_zone": null, + "OS-EXT-AZ:host_availability_zone": "nova", + "OS-EXT-SRV-ATTR:host": "9373c31dbfe6422d9a9997c5f42a8789", "OS-EXT-SRV-ATTR:hypervisor_hostname": "fake-mini", "OS-EXT-SRV-ATTR:instance_name": "instance-00000001", "OS-EXT-STS:power_state": 1, @@ -18,7 +20,7 @@ ] }, "config_drive": "", - "created": "2012-11-15T19:28:30Z", + "created": "2013-01-30T14:03:57Z", "flavor": { "id": "1", "links": [ @@ -28,8 +30,8 @@ } ] }, - "hostId": "edc4f072b6ca46a2d95c717401aa9835a204d3e4e6b148a7faba9ab0", - "id": "05c070bf-1c34-4d99-901c-0f97a7239b86", + "hostId": "fc3a98f0b240ff341eb60ce8c0ae7412970d218381c5a827cfd398ee", + "id": "61608b15-33ea-412f-b9eb-78c6a347ec7b", "image": { "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ @@ -42,11 +44,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/05c070bf-1c34-4d99-901c-0f97a7239b86", + "href": "http://openstack.example.com/v2/openstack/servers/61608b15-33ea-412f-b9eb-78c6a347ec7b", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/05c070bf-1c34-4d99-901c-0f97a7239b86", + "href": "http://openstack.example.com/openstack/servers/61608b15-33ea-412f-b9eb-78c6a347ec7b", "rel": "bookmark" } ], @@ -62,7 +64,7 @@ ], "status": "ACTIVE", "tenant_id": "openstack", - "updated": "2012-11-15T19:28:31Z", + "updated": "2013-01-30T14:04:01Z", "user_id": "fake" } } \ No newline at end of file diff --git a/doc/api_samples/all_extensions/server-get-resp.xml b/doc/api_samples/all_extensions/server-get-resp.xml index 8751a79ca..45e873147 100644 --- a/doc/api_samples/all_extensions/server-get-resp.xml +++ b/doc/api_samples/all_extensions/server-get-resp.xml @@ -1,5 +1,5 @@ - + @@ -14,8 +14,8 @@ - - + + diff --git a/doc/api_samples/all_extensions/servers-details-resp.json b/doc/api_samples/all_extensions/servers-details-resp.json index dd0b8ab05..ed5f4d204 100644 --- a/doc/api_samples/all_extensions/servers-details-resp.json +++ b/doc/api_samples/all_extensions/servers-details-resp.json @@ -2,7 +2,9 @@ "servers": [ { "OS-DCF:diskConfig": "AUTO", - "OS-EXT-SRV-ATTR:host": "f2df66e47d1f427cbd106cf9058360cc", + "OS-EXT-AZ:availability_zone": null, + "OS-EXT-AZ:host_availability_zone": "nova", + "OS-EXT-SRV-ATTR:host": "94d2ccc30d73475ab987661158405463", "OS-EXT-SRV-ATTR:hypervisor_hostname": "fake-mini", "OS-EXT-SRV-ATTR:instance_name": "instance-00000001", "OS-EXT-STS:power_state": 1, @@ -19,7 +21,7 @@ ] }, "config_drive": "", - "created": "2012-11-15T19:28:29Z", + "created": "2013-01-30T14:03:44Z", "flavor": { "id": "1", "links": [ @@ -29,8 +31,8 @@ } ] }, - "hostId": "7eedbc35a14388e24ec12917b1eb0bd5dc969619a0e367591d55d9ef", - "id": "7d7b3dfc-3423-446f-b4b0-7fba038bf8b2", + "hostId": "f74e355ecde489405dfc0a1a48f2a85a5e2564e2ac6633d2b3e1b525", + "id": "033cc72d-708b-473b-ae8e-41064ea3fa21", "image": { "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ @@ -43,11 +45,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/7d7b3dfc-3423-446f-b4b0-7fba038bf8b2", + "href": "http://openstack.example.com/v2/openstack/servers/033cc72d-708b-473b-ae8e-41064ea3fa21", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/7d7b3dfc-3423-446f-b4b0-7fba038bf8b2", + "href": "http://openstack.example.com/openstack/servers/033cc72d-708b-473b-ae8e-41064ea3fa21", "rel": "bookmark" } ], @@ -63,7 +65,7 @@ ], "status": "ACTIVE", "tenant_id": "openstack", - "updated": "2012-11-15T19:28:30Z", + "updated": "2013-01-30T14:03:50Z", "user_id": "fake" } ] diff --git a/doc/api_samples/all_extensions/servers-details-resp.xml b/doc/api_samples/all_extensions/servers-details-resp.xml index bbef848d9..47e452ba1 100644 --- a/doc/api_samples/all_extensions/servers-details-resp.xml +++ b/doc/api_samples/all_extensions/servers-details-resp.xml @@ -1,6 +1,6 @@ - - + + @@ -15,8 +15,8 @@ - - + + -- cgit