diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-11-10 23:36:17 -0500 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-11-16 13:03:12 -0800 |
| commit | 1dba0cdc332e54162dc1d880e80deca968dbff4e (patch) | |
| tree | c479c43014bbd5ca876152279867130168c206d6 /nova/api | |
| parent | 3278f4d72f369403395b745987d7e80330817e6a (diff) | |
| download | nova-1dba0cdc332e54162dc1d880e80deca968dbff4e.tar.gz nova-1dba0cdc332e54162dc1d880e80deca968dbff4e.tar.xz nova-1dba0cdc332e54162dc1d880e80deca968dbff4e.zip | |
Convert remaining calls to use instance objects
Related to blueprint internal-uuids. This touches get_diagnostics,
get_actions, and restore.
Change-Id: Ic4b3d9476fb53cb97b4ea75ad2e846374b2b4a41
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 |