From f5d790df0a16034d767749161c8abd2898e707b4 Mon Sep 17 00:00:00 2001 From: Andrew Melton Date: Thu, 2 May 2013 16:54:26 -0400 Subject: Launch_at and terminated_at on server(s) response Implements bp usage-details-on-instance Change-Id: I0a9101c43a51d597a1eaff9d5a5d08d602024e72 --- doc/api_samples/OS-SRV-USG/server-get-resp.json | 56 +++++++++++++++++++++ doc/api_samples/OS-SRV-USG/server-get-resp.xml | 19 +++++++ doc/api_samples/OS-SRV-USG/server-post-req.json | 16 ++++++ doc/api_samples/OS-SRV-USG/server-post-req.xml | 19 +++++++ doc/api_samples/OS-SRV-USG/server-post-resp.json | 16 ++++++ doc/api_samples/OS-SRV-USG/server-post-resp.xml | 6 +++ .../OS-SRV-USG/servers-detail-resp.json | 58 ++++++++++++++++++++++ doc/api_samples/OS-SRV-USG/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 | 22 ++++---- doc/api_samples/all_extensions/server-get-resp.xml | 11 ++-- .../all_extensions/servers-details-resp.json | 22 ++++---- .../all_extensions/servers-details-resp.xml | 12 ++--- 14 files changed, 257 insertions(+), 32 deletions(-) create mode 100644 doc/api_samples/OS-SRV-USG/server-get-resp.json create mode 100644 doc/api_samples/OS-SRV-USG/server-get-resp.xml create mode 100644 doc/api_samples/OS-SRV-USG/server-post-req.json create mode 100644 doc/api_samples/OS-SRV-USG/server-post-req.xml create mode 100644 doc/api_samples/OS-SRV-USG/server-post-resp.json create mode 100644 doc/api_samples/OS-SRV-USG/server-post-resp.xml create mode 100644 doc/api_samples/OS-SRV-USG/servers-detail-resp.json create mode 100644 doc/api_samples/OS-SRV-USG/servers-detail-resp.xml (limited to 'doc') diff --git a/doc/api_samples/OS-SRV-USG/server-get-resp.json b/doc/api_samples/OS-SRV-USG/server-get-resp.json new file mode 100644 index 000000000..ffb03ebc6 --- /dev/null +++ b/doc/api_samples/OS-SRV-USG/server-get-resp.json @@ -0,0 +1,56 @@ +{ + "server": { + "OS-SRV-USG:launched_at": "2013-05-02T19:26:38.326387", + "OS-SRV-USG:terminated_at": null, + "accessIPv4": "", + "accessIPv6": "", + "addresses": { + "private": [ + { + "addr": "192.168.0.3", + "version": 4 + } + ] + }, + "created": "2013-05-02T19:26:37Z", + "flavor": { + "id": "1", + "links": [ + { + "href": "http://openstack.example.com/openstack/flavors/1", + "rel": "bookmark" + } + ] + }, + "hostId": "1127931217d16e2c8b1e1ec54de06f17805bfaadc0d36525879450d1", + "id": "cbdfb561-b94b-4b98-bb22-7d62575114b1", + "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/cbdfb561-b94b-4b98-bb22-7d62575114b1", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/servers/cbdfb561-b94b-4b98-bb22-7d62575114b1", + "rel": "bookmark" + } + ], + "metadata": { + "My Server Name": "Apache1" + }, + "name": "new-server-test", + "progress": 0, + "status": "ACTIVE", + "tenant_id": "openstack", + "updated": "2013-05-02T19:26:38Z", + "user_id": "fake" + } +} \ No newline at end of file diff --git a/doc/api_samples/OS-SRV-USG/server-get-resp.xml b/doc/api_samples/OS-SRV-USG/server-get-resp.xml new file mode 100644 index 000000000..f5336a147 --- /dev/null +++ b/doc/api_samples/OS-SRV-USG/server-get-resp.xml @@ -0,0 +1,19 @@ + + + + + + + + + + Apache1 + + + + + + + + + \ No newline at end of file diff --git a/doc/api_samples/OS-SRV-USG/server-post-req.json b/doc/api_samples/OS-SRV-USG/server-post-req.json new file mode 100644 index 000000000..d88eb4122 --- /dev/null +++ b/doc/api_samples/OS-SRV-USG/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-SRV-USG/server-post-req.xml b/doc/api_samples/OS-SRV-USG/server-post-req.xml new file mode 100644 index 000000000..0a3c8bb53 --- /dev/null +++ b/doc/api_samples/OS-SRV-USG/server-post-req.xml @@ -0,0 +1,19 @@ + + + + Apache1 + + + + ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp + dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k + IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs + c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g + QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo + ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv + dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy + c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 + b25zLiINCg0KLVJpY2hhcmQgQmFjaA== + + + \ No newline at end of file diff --git a/doc/api_samples/OS-SRV-USG/server-post-resp.json b/doc/api_samples/OS-SRV-USG/server-post-resp.json new file mode 100644 index 000000000..24a497544 --- /dev/null +++ b/doc/api_samples/OS-SRV-USG/server-post-resp.json @@ -0,0 +1,16 @@ +{ + "server": { + "adminPass": "8dRuZpE2Pr7z", + "id": "cbdfb561-b94b-4b98-bb22-7d62575114b1", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/servers/cbdfb561-b94b-4b98-bb22-7d62575114b1", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/servers/cbdfb561-b94b-4b98-bb22-7d62575114b1", + "rel": "bookmark" + } + ] + } +} \ No newline at end of file diff --git a/doc/api_samples/OS-SRV-USG/server-post-resp.xml b/doc/api_samples/OS-SRV-USG/server-post-resp.xml new file mode 100644 index 000000000..bac663bd3 --- /dev/null +++ b/doc/api_samples/OS-SRV-USG/server-post-resp.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/doc/api_samples/OS-SRV-USG/servers-detail-resp.json b/doc/api_samples/OS-SRV-USG/servers-detail-resp.json new file mode 100644 index 000000000..183a8c92e --- /dev/null +++ b/doc/api_samples/OS-SRV-USG/servers-detail-resp.json @@ -0,0 +1,58 @@ +{ + "servers": [ + { + "OS-SRV-USG:launched_at": "2013-05-02T19:26:45.066375", + "OS-SRV-USG:terminated_at": null, + "accessIPv4": "", + "accessIPv6": "", + "addresses": { + "private": [ + { + "addr": "192.168.0.3", + "version": 4 + } + ] + }, + "created": "2013-05-02T19:26:44Z", + "flavor": { + "id": "1", + "links": [ + { + "href": "http://openstack.example.com/openstack/flavors/1", + "rel": "bookmark" + } + ] + }, + "hostId": "15ac731a430372d42a333d9d316ff2af70e0bf5eee523a0bc43779f5", + "id": "fe828a86-aad7-464b-8995-280bedf4fa9b", + "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/fe828a86-aad7-464b-8995-280bedf4fa9b", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/servers/fe828a86-aad7-464b-8995-280bedf4fa9b", + "rel": "bookmark" + } + ], + "metadata": { + "My Server Name": "Apache1" + }, + "name": "new-server-test", + "progress": 0, + "status": "ACTIVE", + "tenant_id": "openstack", + "updated": "2013-05-02T19:26:45Z", + "user_id": "fake" + } + ] +} \ No newline at end of file diff --git a/doc/api_samples/OS-SRV-USG/servers-detail-resp.xml b/doc/api_samples/OS-SRV-USG/servers-detail-resp.xml new file mode 100644 index 000000000..099f2ded1 --- /dev/null +++ b/doc/api_samples/OS-SRV-USG/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 0b587a6b1..ace0dc9bb 100644 --- a/doc/api_samples/all_extensions/extensions-get-resp.json +++ b/doc/api_samples/all_extensions/extensions-get-resp.json @@ -88,6 +88,14 @@ "namespace": "http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1", "updated": "2011-09-14T00:00:00+00:00" }, + { + "alias": "OS-SRV-USG", + "description": "Adds launched_at and terminated_at on Instances.", + "links": [], + "name": "ServerUsage", + "namespace": "http://docs.openstack.org/compute/ext/server_usage/api/v1.1", + "updated": "2013-04-29T00:00:00+00:00" + }, { "alias": "OS-SCH-HNT", "description": "Pass arbitrary key/value pairs to the scheduler.", diff --git a/doc/api_samples/all_extensions/extensions-get-resp.xml b/doc/api_samples/all_extensions/extensions-get-resp.xml index 9924a188a..23d8b30d7 100644 --- a/doc/api_samples/all_extensions/extensions-get-resp.xml +++ b/doc/api_samples/all_extensions/extensions-get-resp.xml @@ -33,6 +33,9 @@ Provide additional data for flavors. + + Adds launched_at and terminated_at on Servers. + Pass arbitrary key/value pairs to the scheduler. diff --git a/doc/api_samples/all_extensions/server-get-resp.json b/doc/api_samples/all_extensions/server-get-resp.json index 67a33cab1..d5b995027 100644 --- a/doc/api_samples/all_extensions/server-get-resp.json +++ b/doc/api_samples/all_extensions/server-get-resp.json @@ -2,26 +2,28 @@ "server": { "OS-DCF:diskConfig": "AUTO", "OS-EXT-AZ:availability_zone": "nova", - "OS-EXT-SRV-ATTR:host": "b00875071c774b5487d217b82f03dfa2", + "OS-EXT-SRV-ATTR:host": "1e6e2aca70404eddb6120b83ba0ba990", "OS-EXT-SRV-ATTR:hypervisor_hostname": "fake-mini", "OS-EXT-SRV-ATTR:instance_name": "instance-00000001", "OS-EXT-STS:power_state": 1, "OS-EXT-STS:task_state": null, "OS-EXT-STS:vm_state": "active", + "OS-SRV-USG:launched_at": "2013-05-02T19:13:48.734609", + "OS-SRV-USG:terminated_at": null, "accessIPv4": "", "accessIPv6": "", "addresses": { "private": [ { + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", "OS-EXT-IPS:type": "fixed", "addr": "192.168.0.3", - "version": 4, - "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:e1:42:90" + "version": 4 } ] }, "config_drive": "", - "created": "2013-02-07T18:58:56Z", + "created": "2013-05-02T19:13:48Z", "flavor": { "id": "1", "links": [ @@ -31,8 +33,8 @@ } ] }, - "hostId": "ecbf72ad08d0d4f26768f526d17c2813812b4bc1598f081e16eb9b8b", - "id": "12c05fea-29ec-4f77-9025-b3d72584ef1d", + "hostId": "2e41621ca04684ffb8b3616c554bcfa402856e1678aaf9473bfced1a", + "id": "a594696d-f35a-4238-a152-ae471395bdfe", "image": { "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ @@ -45,11 +47,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/12c05fea-29ec-4f77-9025-b3d72584ef1d", + "href": "http://openstack.example.com/v2/openstack/servers/a594696d-f35a-4238-a152-ae471395bdfe", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/12c05fea-29ec-4f77-9025-b3d72584ef1d", + "href": "http://openstack.example.com/openstack/servers/a594696d-f35a-4238-a152-ae471395bdfe", "rel": "bookmark" } ], @@ -65,7 +67,7 @@ ], "status": "ACTIVE", "tenant_id": "openstack", - "updated": "2013-02-07T18:58:57Z", + "updated": "2013-05-02T19:13:48Z", "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 6db40414b..42f62cfeb 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 @@ - + @@ -11,13 +11,12 @@ - + - - + + - + \ No newline at end of file diff --git a/doc/api_samples/all_extensions/servers-details-resp.json b/doc/api_samples/all_extensions/servers-details-resp.json index 05f11a246..038df104e 100644 --- a/doc/api_samples/all_extensions/servers-details-resp.json +++ b/doc/api_samples/all_extensions/servers-details-resp.json @@ -3,26 +3,28 @@ { "OS-DCF:diskConfig": "AUTO", "OS-EXT-AZ:availability_zone": "nova", - "OS-EXT-SRV-ATTR:host": "33924d68ef4e4214bb9bc200178d23b8", + "OS-EXT-SRV-ATTR:host": "f43a596b8ec841e4bd486473ba0693bb", "OS-EXT-SRV-ATTR:hypervisor_hostname": "fake-mini", "OS-EXT-SRV-ATTR:instance_name": "instance-00000001", "OS-EXT-STS:power_state": 1, "OS-EXT-STS:task_state": null, "OS-EXT-STS:vm_state": "active", + "OS-SRV-USG:launched_at": "2013-05-02T19:14:01.806067", + "OS-SRV-USG:terminated_at": null, "accessIPv4": "", "accessIPv6": "", "addresses": { "private": [ { + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", "OS-EXT-IPS:type": "fixed", "addr": "192.168.0.3", - "version": 4, - "OS-EXT-IPS-MAC:mac_addr": "00:0c:29:e1:42:90" + "version": 4 } ] }, "config_drive": "", - "created": "2013-02-07T18:58:56Z", + "created": "2013-05-02T19:14:01Z", "flavor": { "id": "1", "links": [ @@ -32,8 +34,8 @@ } ] }, - "hostId": "e0028a678cb7760fe5987947ab495dbb0f79c1071850f87a9aa8227f", - "id": "3ec52036-bfee-4869-9c4c-81a579d72196", + "hostId": "6a892e9c0d3105ce7c93fd44982253a16d6bd760fc80cb686cfe1c18", + "id": "cdd530d5-140d-4f16-88a6-690cbbabc186", "image": { "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ @@ -46,11 +48,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/3ec52036-bfee-4869-9c4c-81a579d72196", + "href": "http://openstack.example.com/v2/openstack/servers/cdd530d5-140d-4f16-88a6-690cbbabc186", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/3ec52036-bfee-4869-9c4c-81a579d72196", + "href": "http://openstack.example.com/openstack/servers/cdd530d5-140d-4f16-88a6-690cbbabc186", "rel": "bookmark" } ], @@ -66,8 +68,8 @@ ], "status": "ACTIVE", "tenant_id": "openstack", - "updated": "2013-02-07T18:58:57Z", + "updated": "2013-05-02T19:14:01Z", "user_id": "fake" } ] -} +} \ No newline at end of file diff --git a/doc/api_samples/all_extensions/servers-details-resp.xml b/doc/api_samples/all_extensions/servers-details-resp.xml index 8061caf21..45a96d349 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 @@ - - + + @@ -12,13 +12,13 @@ - + - - + + - + \ No newline at end of file -- cgit