From 123fa7b04070edf77fcac4e01268a04a42452891 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Wed, 14 Nov 2012 19:08:10 -0500 Subject: updated api_samples with real hypervisor_hostname now that hypervisor_hostname is getting set in tests, update api_samples with something better than none part of blueprint:nova-api-samples DocImpact Change-Id: Iaac6a5d2d172eb3c56b64f0dc2a6075a79412712 --- .../OS-EXT-SRV-ATTR/extended-server-attrs-get.json | 16 ++++++++-------- .../OS-EXT-SRV-ATTR/extended-server-attrs-get.xml | 6 +++--- .../OS-EXT-SRV-ATTR/extended-server-attrs-list.json | 16 ++++++++-------- .../OS-EXT-SRV-ATTR/extended-server-attrs-list.xml | 6 +++--- doc/api_samples/all_extensions/server-get-resp.json | 16 ++++++++-------- doc/api_samples/all_extensions/server-get-resp.xml | 6 +++--- .../all_extensions/servers-details-resp.json | 17 +++++++++-------- doc/api_samples/all_extensions/servers-details-resp.xml | 6 +++--- 8 files changed, 45 insertions(+), 44 deletions(-) diff --git a/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-get.json b/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-get.json index 337bc26db..ad3bcab5d 100644 --- a/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-get.json +++ b/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-get.json @@ -1,7 +1,7 @@ { "server": { - "OS-EXT-SRV-ATTR:host": "f852c7db3f344eec955c369b8478fef7", - "OS-EXT-SRV-ATTR:hypervisor_hostname": null, + "OS-EXT-SRV-ATTR:host": "1169a68456af48238da47b1d5957a714", + "OS-EXT-SRV-ATTR:hypervisor_hostname": "fake-mini", "OS-EXT-SRV-ATTR:instance_name": "instance-00000001", "accessIPv4": "", "accessIPv6": "", @@ -13,7 +13,7 @@ } ] }, - "created": "2012-09-13T17:48:30Z", + "created": "2012-11-15T19:27:04Z", "flavor": { "id": "1", "links": [ @@ -23,8 +23,8 @@ } ] }, - "hostId": "4f846b99d954c7eb75dcbb25e1b92ccc5e77ba74f2bf22c2d8dd24d5", - "id": "0b57a8d2-b1d0-43d8-b81b-9ef446281bfa", + "hostId": "2dfce43c41dd288cfac3a5b4251742b3bd2b37c12eb5927e757d9b4c", + "id": "1fc2392e-5727-46af-bc21-317a4a3eb04c", "image": { "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ @@ -36,11 +36,11 @@ }, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/0b57a8d2-b1d0-43d8-b81b-9ef446281bfa", + "href": "http://openstack.example.com/v2/openstack/servers/1fc2392e-5727-46af-bc21-317a4a3eb04c", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/0b57a8d2-b1d0-43d8-b81b-9ef446281bfa", + "href": "http://openstack.example.com/openstack/servers/1fc2392e-5727-46af-bc21-317a4a3eb04c", "rel": "bookmark" } ], @@ -51,7 +51,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "2012-09-13T17:48:30Z", + "updated": "2012-11-15T19:27:04Z", "user_id": "fake" } } \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-get.xml b/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-get.xml index e8d340a97..4b42c3586 100644 --- a/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-get.xml +++ b/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-get.xml @@ -1,5 +1,5 @@ - + @@ -14,6 +14,6 @@ - - + + \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-list.json b/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-list.json index f92181a34..db3de77f4 100644 --- a/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-list.json +++ b/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-list.json @@ -1,8 +1,8 @@ { "servers": [ { - "OS-EXT-SRV-ATTR:host": "c90b8445a27f4057ac2457d4f511a617", - "OS-EXT-SRV-ATTR:hypervisor_hostname": null, + "OS-EXT-SRV-ATTR:host": "dd99797793774612b081a8be19bf721a", + "OS-EXT-SRV-ATTR:hypervisor_hostname": "fake-mini", "OS-EXT-SRV-ATTR:instance_name": "instance-00000001", "accessIPv4": "", "accessIPv6": "", @@ -14,7 +14,7 @@ } ] }, - "created": "2012-09-14T09:30:19Z", + "created": "2012-11-15T19:27:05Z", "flavor": { "id": "1", "links": [ @@ -24,8 +24,8 @@ } ] }, - "hostId": "5cb28923c8cc3f45fca3dd884249a8bf98f8a81900dd4b244d446cfd", - "id": "f678aaae-1430-409d-8a48-efa08b885b25", + "hostId": "146245c049213a54b8c2352751518fcb4c2befd1b942b45a5a705d35", + "id": "e0c3563a-84ef-4d0b-bb80-23392cd23882", "image": { "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ @@ -37,11 +37,11 @@ }, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/f678aaae-1430-409d-8a48-efa08b885b25", + "href": "http://openstack.example.com/v2/openstack/servers/e0c3563a-84ef-4d0b-bb80-23392cd23882", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/f678aaae-1430-409d-8a48-efa08b885b25", + "href": "http://openstack.example.com/openstack/servers/e0c3563a-84ef-4d0b-bb80-23392cd23882", "rel": "bookmark" } ], @@ -52,7 +52,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "2012-09-14T09:30:19Z", + "updated": "2012-11-15T19:27:05Z", "user_id": "fake" } ] diff --git a/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-list.xml b/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-list.xml index 4fb7a2f82..8179a3bf9 100644 --- a/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-list.xml +++ b/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-list.xml @@ -1,6 +1,6 @@ - + @@ -15,7 +15,7 @@ - - + + \ No newline at end of file diff --git a/doc/api_samples/all_extensions/server-get-resp.json b/doc/api_samples/all_extensions/server-get-resp.json index 3eb1870f9..a174bd779 100644 --- a/doc/api_samples/all_extensions/server-get-resp.json +++ b/doc/api_samples/all_extensions/server-get-resp.json @@ -1,8 +1,8 @@ { "server": { "OS-DCF:diskConfig": "AUTO", - "OS-EXT-SRV-ATTR:host": "3972bc79fa2a4754b7559153a5a48422", - "OS-EXT-SRV-ATTR:hypervisor_hostname": null, + "OS-EXT-SRV-ATTR:host": "543330fc7412414094e79c867798cefd", + "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, @@ -18,7 +18,7 @@ ] }, "config_drive": "", - "created": "2012-08-20T21:11:06Z", + "created": "2012-11-15T19:28:30Z", "flavor": { "id": "1", "links": [ @@ -28,8 +28,8 @@ } ] }, - "hostId": "dc23873c80c22f14705d190b645b59398cbc8ed3cdf6145468051c0d", - "id": "7dc62bde-85f0-45b5-8c74-5fb209314807", + "hostId": "edc4f072b6ca46a2d95c717401aa9835a204d3e4e6b148a7faba9ab0", + "id": "05c070bf-1c34-4d99-901c-0f97a7239b86", "image": { "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ @@ -42,11 +42,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/7dc62bde-85f0-45b5-8c74-5fb209314807", + "href": "http://openstack.example.com/v2/openstack/servers/05c070bf-1c34-4d99-901c-0f97a7239b86", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/7dc62bde-85f0-45b5-8c74-5fb209314807", + "href": "http://openstack.example.com/openstack/servers/05c070bf-1c34-4d99-901c-0f97a7239b86", "rel": "bookmark" } ], @@ -62,7 +62,7 @@ ], "status": "ACTIVE", "tenant_id": "openstack", - "updated": "2012-08-20T21:11:06Z", + "updated": "2012-11-15T19:28:31Z", "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 6f2d8587f..8751a79ca 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 dc2698fec..dd0b8ab05 100644 --- a/doc/api_samples/all_extensions/servers-details-resp.json +++ b/doc/api_samples/all_extensions/servers-details-resp.json @@ -2,8 +2,8 @@ "servers": [ { "OS-DCF:diskConfig": "AUTO", - "OS-EXT-SRV-ATTR:host": "1ed961df12f5434a8e54e0efd1049fa5", - "OS-EXT-SRV-ATTR:hypervisor_hostname": null, + "OS-EXT-SRV-ATTR:host": "f2df66e47d1f427cbd106cf9058360cc", + "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, @@ -19,7 +19,7 @@ ] }, "config_drive": "", - "created": "2012-09-12T17:16:15Z", + "created": "2012-11-15T19:28:29Z", "flavor": { "id": "1", "links": [ @@ -29,8 +29,8 @@ } ] }, - "hostId": "c161a6e3edcd047317a6cfbe599d7711850fd871210b62fdd2f6479e", - "id": "1d0f60bc-8c90-425d-8c64-cdaa49cd2303", + "hostId": "7eedbc35a14388e24ec12917b1eb0bd5dc969619a0e367591d55d9ef", + "id": "7d7b3dfc-3423-446f-b4b0-7fba038bf8b2", "image": { "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ @@ -40,13 +40,14 @@ } ] }, + "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/1d0f60bc-8c90-425d-8c64-cdaa49cd2303", + "href": "http://openstack.example.com/v2/openstack/servers/7d7b3dfc-3423-446f-b4b0-7fba038bf8b2", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/1d0f60bc-8c90-425d-8c64-cdaa49cd2303", + "href": "http://openstack.example.com/openstack/servers/7d7b3dfc-3423-446f-b4b0-7fba038bf8b2", "rel": "bookmark" } ], @@ -62,7 +63,7 @@ ], "status": "ACTIVE", "tenant_id": "openstack", - "updated": "2012-09-12T17:16:15Z", + "updated": "2012-11-15T19:28:30Z", "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 c769c8ec1..bbef848d9 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