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