diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-11-16 21:33:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-11-16 21:33:48 +0000 |
| commit | 217af7df5980ee7a258d2e8b24aea4444c083201 (patch) | |
| tree | 98d5bb48131e741d52a717e00837f49ced16def4 /nova/api | |
| parent | 7c34941b89437e69037be4ea392885c914c227ce (diff) | |
| parent | 1dba0cdc332e54162dc1d880e80deca968dbff4e (diff) | |
| download | nova-217af7df5980ee7a258d2e8b24aea4444c083201.tar.gz nova-217af7df5980ee7a258d2e8b24aea4444c083201.tar.xz nova-217af7df5980ee7a258d2e8b24aea4444c083201.zip | |
Merge "Convert remaining calls to use instance objects"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/contrib/deferred_delete.py | 3 | ||||
| -rw-r--r-- | nova/api/openstack/servers.py | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/nova/api/openstack/contrib/deferred_delete.py b/nova/api/openstack/contrib/deferred_delete.py index 013acbbea..8415ca4b3 100644 --- a/nova/api/openstack/contrib/deferred_delete.py +++ b/nova/api/openstack/contrib/deferred_delete.py @@ -42,7 +42,8 @@ class Deferred_delete(extensions.ExtensionDescriptor): """Restore a previously deleted instance.""" context = req.environ["nova.context"] - self.compute_api.restore(context, instance_id) + instance = self.compute_api.get(context, instance_id) + self.compute_api.restore(context, instance) return webob.Response(status_int=202) def _force_delete(self, input_dict, req, instance_id): diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index 1e9089560..677635354 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -646,12 +646,14 @@ class Controller(object): def diagnostics(self, req, id): """Permit Admins to retrieve server diagnostics.""" ctxt = req.environ["nova.context"] - return self.compute_api.get_diagnostics(ctxt, id) + instance = self._get_server(ctxt, id) + return self.compute_api.get_diagnostics(ctxt, instance) def actions(self, req, id): """Permit Admins to retrieve server actions.""" ctxt = req.environ["nova.context"] - items = self.compute_api.get_actions(ctxt, id) + instance = self._get_server(ctxt, id) + items = self.compute_api.get_actions(ctxt, instance) actions = [] # TODO(jk0): Do not do pre-serialization here once the default # serializer is updated |