From dd66f235ecf2ff67819917ee07bcb0ea13a1b17b Mon Sep 17 00:00:00 2001 From: Oleg Bondarev Date: Wed, 17 Apr 2013 18:18:03 +0400 Subject: Include list of attached volumes with instance info Fixes bug 1112998 Change-Id: I1c3eb578339aabbcfed107043f39e30daf633c4a --- doc/api_samples/OS-DCF/list-servers-detail-get.json | 3 ++- doc/api_samples/OS-DCF/server-action-rebuild-resp.json | 3 ++- doc/api_samples/OS-DCF/server-get-resp.json | 3 ++- doc/api_samples/OS-DCF/server-update-put-resp.json | 3 ++- doc/api_samples/OS-EXT-AZ/server-get-resp.json | 3 ++- doc/api_samples/OS-EXT-AZ/servers-detail-resp.json | 3 ++- doc/api_samples/OS-EXT-IPS-MAC/server-get-resp.json | 3 ++- doc/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.json | 3 ++- doc/api_samples/OS-EXT-IPS/server-get-resp.json | 3 ++- doc/api_samples/OS-EXT-IPS/servers-detail-resp.json | 3 ++- doc/api_samples/OS-EXT-SRV-ATTR/server-get-resp.json | 3 ++- doc/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.json | 3 ++- doc/api_samples/OS-EXT-STS/server-get-resp.json | 3 ++- doc/api_samples/OS-EXT-STS/servers-detail-resp.json | 3 ++- doc/api_samples/all_extensions/server-action-rebuild-resp.json | 3 ++- doc/api_samples/all_extensions/server-get-resp.json | 6 +++++- doc/api_samples/all_extensions/server-get-resp.xml | 2 ++ doc/api_samples/all_extensions/servers-details-resp.json | 6 +++++- doc/api_samples/all_extensions/servers-details-resp.xml | 2 ++ doc/api_samples/os-config-drive/server-config-drive-get-resp.json | 3 ++- .../os-config-drive/servers-config-drive-details-resp.json | 3 ++- doc/api_samples/os-hide-server-addresses/server-get-resp.json | 6 +++++- doc/api_samples/os-hide-server-addresses/server-get-resp.xml | 2 ++ doc/api_samples/os-hide-server-addresses/servers-details-resp.json | 6 +++++- doc/api_samples/os-hide-server-addresses/servers-details-resp.xml | 2 ++ doc/api_samples/os-rescue/server-get-resp-rescue.json | 3 ++- doc/api_samples/os-rescue/server-get-resp-unrescue.json | 3 ++- doc/api_samples/server-action-rebuild-resp.json | 3 ++- doc/api_samples/server-get-resp.json | 6 +++++- doc/api_samples/server-get-resp.xml | 2 ++ doc/api_samples/servers-details-resp.json | 6 +++++- doc/api_samples/servers-details-resp.xml | 2 ++ 32 files changed, 82 insertions(+), 26 deletions(-) (limited to 'doc') diff --git a/doc/api_samples/OS-DCF/list-servers-detail-get.json b/doc/api_samples/OS-DCF/list-servers-detail-get.json index 7aea51e19..3b0c66329 100644 --- a/doc/api_samples/OS-DCF/list-servers-detail-get.json +++ b/doc/api_samples/OS-DCF/list-servers-detail-get.json @@ -51,7 +51,8 @@ "status": "ACTIVE", "tenant_id": "openstack", "updated": "2012-12-02T02:11:56Z", - "user_id": "fake" + "user_id": "fake", + "volumes_attached": [] } ] } \ No newline at end of file diff --git a/doc/api_samples/OS-DCF/server-action-rebuild-resp.json b/doc/api_samples/OS-DCF/server-action-rebuild-resp.json index 24e1e5d04..2f6be80e1 100644 --- a/doc/api_samples/OS-DCF/server-action-rebuild-resp.json +++ b/doc/api_samples/OS-DCF/server-action-rebuild-resp.json @@ -51,6 +51,7 @@ "status": "ACTIVE", "tenant_id": "openstack", "updated": "2012-12-02T02:11:56Z", - "user_id": "fake" + "user_id": "fake", + "volumes_attached": [] } } \ No newline at end of file diff --git a/doc/api_samples/OS-DCF/server-get-resp.json b/doc/api_samples/OS-DCF/server-get-resp.json index 4ad77036f..94742a806 100644 --- a/doc/api_samples/OS-DCF/server-get-resp.json +++ b/doc/api_samples/OS-DCF/server-get-resp.json @@ -50,6 +50,7 @@ "status": "ACTIVE", "tenant_id": "openstack", "updated": "2012-12-02T02:11:55Z", - "user_id": "fake" + "user_id": "fake", + "volumes_attached": [] } } \ No newline at end of file diff --git a/doc/api_samples/OS-DCF/server-update-put-resp.json b/doc/api_samples/OS-DCF/server-update-put-resp.json index ce6e08455..9750db476 100644 --- a/doc/api_samples/OS-DCF/server-update-put-resp.json +++ b/doc/api_samples/OS-DCF/server-update-put-resp.json @@ -50,6 +50,7 @@ "status": "ACTIVE", "tenant_id": "openstack", "updated": "2012-12-02T02:11:58Z", - "user_id": "fake" + "user_id": "fake", + "volumes_attached": [] } } \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-AZ/server-get-resp.json b/doc/api_samples/OS-EXT-AZ/server-get-resp.json index c2f0fb2ba..e98b9bc43 100644 --- a/doc/api_samples/OS-EXT-AZ/server-get-resp.json +++ b/doc/api_samples/OS-EXT-AZ/server-get-resp.json @@ -50,6 +50,7 @@ "status": "ACTIVE", "tenant_id": "openstack", "updated": "2013-01-30T13:38:49Z", - "user_id": "fake" + "user_id": "fake", + "volumes_attached": [] } } diff --git a/doc/api_samples/OS-EXT-AZ/servers-detail-resp.json b/doc/api_samples/OS-EXT-AZ/servers-detail-resp.json index 2ecea959a..b9310e101 100644 --- a/doc/api_samples/OS-EXT-AZ/servers-detail-resp.json +++ b/doc/api_samples/OS-EXT-AZ/servers-detail-resp.json @@ -51,7 +51,8 @@ "status": "ACTIVE", "tenant_id": "openstack", "updated": "2013-01-30T13:26:52Z", - "user_id": "fake" + "user_id": "fake", + "volumes_attached": [] } ] } diff --git a/doc/api_samples/OS-EXT-IPS-MAC/server-get-resp.json b/doc/api_samples/OS-EXT-IPS-MAC/server-get-resp.json index 50b53d810..2767c5c0e 100644 --- a/doc/api_samples/OS-EXT-IPS-MAC/server-get-resp.json +++ b/doc/api_samples/OS-EXT-IPS-MAC/server-get-resp.json @@ -50,6 +50,7 @@ "status": "ACTIVE", "tenant_id": "openstack", "updated": "2013-02-07T18:46:29Z", - "user_id": "fake" + "user_id": "fake", + "volumes_attached": [] } } diff --git a/doc/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.json b/doc/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.json index 115780401..41b1c37c9 100644 --- a/doc/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.json +++ b/doc/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.json @@ -51,7 +51,8 @@ "status": "ACTIVE", "tenant_id": "openstack", "updated": "2013-02-07T18:40:59Z", - "user_id": "fake" + "user_id": "fake", + "volumes_attached": [] } ] } diff --git a/doc/api_samples/OS-EXT-IPS/server-get-resp.json b/doc/api_samples/OS-EXT-IPS/server-get-resp.json index e985ad115..66b710eda 100644 --- a/doc/api_samples/OS-EXT-IPS/server-get-resp.json +++ b/doc/api_samples/OS-EXT-IPS/server-get-resp.json @@ -50,6 +50,7 @@ "status": "ACTIVE", "tenant_id": "openstack", "updated": "2013-02-07T18:46:29Z", - "user_id": "fake" + "user_id": "fake", + "volumes_attached": [] } } \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-IPS/servers-detail-resp.json b/doc/api_samples/OS-EXT-IPS/servers-detail-resp.json index cb91d6937..2127ffc1e 100644 --- a/doc/api_samples/OS-EXT-IPS/servers-detail-resp.json +++ b/doc/api_samples/OS-EXT-IPS/servers-detail-resp.json @@ -51,7 +51,8 @@ "status": "ACTIVE", "tenant_id": "openstack", "updated": "2013-02-07T18:40:59Z", - "user_id": "fake" + "user_id": "fake", + "volumes_attached": [] } ] } \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-SRV-ATTR/server-get-resp.json b/doc/api_samples/OS-EXT-SRV-ATTR/server-get-resp.json index ad3bcab5d..31b8687b4 100644 --- a/doc/api_samples/OS-EXT-SRV-ATTR/server-get-resp.json +++ b/doc/api_samples/OS-EXT-SRV-ATTR/server-get-resp.json @@ -52,6 +52,7 @@ "status": "ACTIVE", "tenant_id": "openstack", "updated": "2012-11-15T19:27:04Z", - "user_id": "fake" + "user_id": "fake", + "volumes_attached": [] } } \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.json b/doc/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.json index db3de77f4..b980c0857 100644 --- a/doc/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.json +++ b/doc/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.json @@ -53,7 +53,8 @@ "status": "ACTIVE", "tenant_id": "openstack", "updated": "2012-11-15T19:27:05Z", - "user_id": "fake" + "user_id": "fake", + "volumes_attached": [] } ] } \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-STS/server-get-resp.json b/doc/api_samples/OS-EXT-STS/server-get-resp.json index 763426bb1..7836dedc3 100644 --- a/doc/api_samples/OS-EXT-STS/server-get-resp.json +++ b/doc/api_samples/OS-EXT-STS/server-get-resp.json @@ -52,6 +52,7 @@ "status": "ACTIVE", "tenant_id": "openstack", "updated": "2013-02-07T19:35:10Z", - "user_id": "fake" + "user_id": "fake", + "volumes_attached": [] } } \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-STS/servers-detail-resp.json b/doc/api_samples/OS-EXT-STS/servers-detail-resp.json index 6764bd883..e67524e55 100644 --- a/doc/api_samples/OS-EXT-STS/servers-detail-resp.json +++ b/doc/api_samples/OS-EXT-STS/servers-detail-resp.json @@ -53,7 +53,8 @@ "status": "ACTIVE", "tenant_id": "openstack", "updated": "2012-12-05T07:34:10Z", - "user_id": "fake" + "user_id": "fake", + "volumes_attached": [] } ] } \ No newline at end of file diff --git a/doc/api_samples/all_extensions/server-action-rebuild-resp.json b/doc/api_samples/all_extensions/server-action-rebuild-resp.json index 04ee1d4fb..49fe6c8c6 100644 --- a/doc/api_samples/all_extensions/server-action-rebuild-resp.json +++ b/doc/api_samples/all_extensions/server-action-rebuild-resp.json @@ -51,6 +51,7 @@ "status": "ACTIVE", "tenant_id": "openstack", "updated": "2012-09-25T13:36:09Z", - "user_id": "fake" + "user_id": "fake", + "volumes_attached": [] } } \ 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 67a33cab1..2b2503e53 100644 --- a/doc/api_samples/all_extensions/server-get-resp.json +++ b/doc/api_samples/all_extensions/server-get-resp.json @@ -66,6 +66,10 @@ "status": "ACTIVE", "tenant_id": "openstack", "updated": "2013-02-07T18:58:57Z", - "user_id": "fake" + "user_id": "fake", + "volumes_attached": [ + {"id": "volume_id1"}, + {"id": "volume_id2"} + ] } } diff --git a/doc/api_samples/all_extensions/server-get-resp.xml b/doc/api_samples/all_extensions/server-get-resp.xml index 6db40414b..52598a5db 100644 --- a/doc/api_samples/all_extensions/server-get-resp.xml +++ b/doc/api_samples/all_extensions/server-get-resp.xml @@ -15,6 +15,8 @@ OS-EXT-IPS-MAC:mac_addr="00:0c:29:e1:42:90"/> + + diff --git a/doc/api_samples/all_extensions/servers-details-resp.json b/doc/api_samples/all_extensions/servers-details-resp.json index 05f11a246..5fd189443 100644 --- a/doc/api_samples/all_extensions/servers-details-resp.json +++ b/doc/api_samples/all_extensions/servers-details-resp.json @@ -67,7 +67,11 @@ "status": "ACTIVE", "tenant_id": "openstack", "updated": "2013-02-07T18:58:57Z", - "user_id": "fake" + "user_id": "fake", + "volumes_attached": [ + {"id": "volume_id1"}, + {"id": "volume_id2"} + ] } ] } diff --git a/doc/api_samples/all_extensions/servers-details-resp.xml b/doc/api_samples/all_extensions/servers-details-resp.xml index 8061caf21..7a3ccbbe7 100644 --- a/doc/api_samples/all_extensions/servers-details-resp.xml +++ b/doc/api_samples/all_extensions/servers-details-resp.xml @@ -15,6 +15,8 @@ + + diff --git a/doc/api_samples/os-config-drive/server-config-drive-get-resp.json b/doc/api_samples/os-config-drive/server-config-drive-get-resp.json index 8745b3d62..e0adab26a 100644 --- a/doc/api_samples/os-config-drive/server-config-drive-get-resp.json +++ b/doc/api_samples/os-config-drive/server-config-drive-get-resp.json @@ -50,6 +50,7 @@ "status": "ACTIVE", "tenant_id": "openstack", "updated": "2013-02-04T13:17:51Z", - "user_id": "fake" + "user_id": "fake", + "volumes_attached": [] } } \ No newline at end of file diff --git a/doc/api_samples/os-config-drive/servers-config-drive-details-resp.json b/doc/api_samples/os-config-drive/servers-config-drive-details-resp.json index 1373721ef..2af535ff2 100644 --- a/doc/api_samples/os-config-drive/servers-config-drive-details-resp.json +++ b/doc/api_samples/os-config-drive/servers-config-drive-details-resp.json @@ -51,7 +51,8 @@ "status": "ACTIVE", "tenant_id": "openstack", "updated": "2013-02-04T13:21:44Z", - "user_id": "fake" + "user_id": "fake", + "volumes_attached": [] } ] } \ No newline at end of file diff --git a/doc/api_samples/os-hide-server-addresses/server-get-resp.json b/doc/api_samples/os-hide-server-addresses/server-get-resp.json index b4209f461..982cb9a74 100644 --- a/doc/api_samples/os-hide-server-addresses/server-get-resp.json +++ b/doc/api_samples/os-hide-server-addresses/server-get-resp.json @@ -49,6 +49,10 @@ "status": "ACTIVE", "tenant_id": "openstack", "updated": "2012-12-19T20:32:42Z", - "user_id": "fake" + "user_id": "fake", + "volumes_attached": [ + {"id": "volume_id1"}, + {"id": "volume_id2"} + ] } } \ No newline at end of file diff --git a/doc/api_samples/os-hide-server-addresses/server-get-resp.xml b/doc/api_samples/os-hide-server-addresses/server-get-resp.xml index caa4a2fa5..4eb8999aa 100644 --- a/doc/api_samples/os-hide-server-addresses/server-get-resp.xml +++ b/doc/api_samples/os-hide-server-addresses/server-get-resp.xml @@ -14,6 +14,8 @@ + + \ No newline at end of file diff --git a/doc/api_samples/os-hide-server-addresses/servers-details-resp.json b/doc/api_samples/os-hide-server-addresses/servers-details-resp.json index 3787cd707..bdd37a4c0 100644 --- a/doc/api_samples/os-hide-server-addresses/servers-details-resp.json +++ b/doc/api_samples/os-hide-server-addresses/servers-details-resp.json @@ -50,7 +50,11 @@ "status": "ACTIVE", "tenant_id": "openstack", "updated": "2012-12-19T20:32:39Z", - "user_id": "fake" + "user_id": "fake", + "volumes_attached": [ + {"id": "volume_id1"}, + {"id": "volume_id2"} + ] } ] } \ No newline at end of file diff --git a/doc/api_samples/os-hide-server-addresses/servers-details-resp.xml b/doc/api_samples/os-hide-server-addresses/servers-details-resp.xml index 0296cc167..0fc121880 100644 --- a/doc/api_samples/os-hide-server-addresses/servers-details-resp.xml +++ b/doc/api_samples/os-hide-server-addresses/servers-details-resp.xml @@ -15,6 +15,8 @@ + + diff --git a/doc/api_samples/os-rescue/server-get-resp-rescue.json b/doc/api_samples/os-rescue/server-get-resp-rescue.json index d08191977..926327080 100644 --- a/doc/api_samples/os-rescue/server-get-resp-rescue.json +++ b/doc/api_samples/os-rescue/server-get-resp-rescue.json @@ -48,6 +48,7 @@ "status": "RESCUE", "tenant_id": "openstack", "updated": "2012-09-19T09:22:27Z", - "user_id": "fake" + "user_id": "fake", + "volumes_attached": [] } } \ No newline at end of file diff --git a/doc/api_samples/os-rescue/server-get-resp-unrescue.json b/doc/api_samples/os-rescue/server-get-resp-unrescue.json index 21a35da7f..5ab7a742e 100644 --- a/doc/api_samples/os-rescue/server-get-resp-unrescue.json +++ b/doc/api_samples/os-rescue/server-get-resp-unrescue.json @@ -49,6 +49,7 @@ "status": "ACTIVE", "tenant_id": "openstack", "updated": "2012-09-19T09:22:28Z", - "user_id": "fake" + "user_id": "fake", + "volumes_attached": [] } } \ No newline at end of file diff --git a/doc/api_samples/server-action-rebuild-resp.json b/doc/api_samples/server-action-rebuild-resp.json index ac6d6e7e5..49ef1b4ae 100644 --- a/doc/api_samples/server-action-rebuild-resp.json +++ b/doc/api_samples/server-action-rebuild-resp.json @@ -50,6 +50,7 @@ "status": "ACTIVE", "tenant_id": "openstack", "updated": "2012-09-12T17:20:37Z", - "user_id": "fake" + "user_id": "fake", + "volumes_attached": [] } } \ No newline at end of file diff --git a/doc/api_samples/server-get-resp.json b/doc/api_samples/server-get-resp.json index c6ebd4195..138f186eb 100644 --- a/doc/api_samples/server-get-resp.json +++ b/doc/api_samples/server-get-resp.json @@ -49,6 +49,10 @@ "status": "ACTIVE", "tenant_id": "openstack", "updated": "2012-08-20T21:11:09Z", - "user_id": "fake" + "user_id": "fake", + "volumes_attached": [ + {"id": "volume_id1"}, + {"id": "volume_id2"} + ] } } \ No newline at end of file diff --git a/doc/api_samples/server-get-resp.xml b/doc/api_samples/server-get-resp.xml index e59319e42..528707810 100644 --- a/doc/api_samples/server-get-resp.xml +++ b/doc/api_samples/server-get-resp.xml @@ -14,6 +14,8 @@ + + \ No newline at end of file diff --git a/doc/api_samples/servers-details-resp.json b/doc/api_samples/servers-details-resp.json index 3ea61531e..ac27a00dd 100644 --- a/doc/api_samples/servers-details-resp.json +++ b/doc/api_samples/servers-details-resp.json @@ -50,7 +50,11 @@ "status": "ACTIVE", "tenant_id": "openstack", "updated": "2012-09-07T16:56:37Z", - "user_id": "fake" + "user_id": "fake", + "volumes_attached": [ + {"id": "volume_id1"}, + {"id": "volume_id2"} + ] } ] } \ No newline at end of file diff --git a/doc/api_samples/servers-details-resp.xml b/doc/api_samples/servers-details-resp.xml index 83bcf0f79..eab2bd887 100644 --- a/doc/api_samples/servers-details-resp.xml +++ b/doc/api_samples/servers-details-resp.xml @@ -15,6 +15,8 @@ + + -- cgit