diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-11-12 17:15:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-11-12 17:15:00 +0000 |
| commit | fb95f93bbdf27e0cecece6810c833b611793b123 (patch) | |
| tree | d64e83721bb9df3a226dc6a90f790c94730a6b07 /nova/api | |
| parent | 4efb01f4cbcf29150bdaa608242605a6dfef4140 (diff) | |
| parent | 43fb6880d90197735b0b9bf4587fcece825c1ed0 (diff) | |
Merge "Convert pause/unpause, sus/res to use instance obj"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/contrib/admin_actions.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/nova/api/openstack/contrib/admin_actions.py b/nova/api/openstack/contrib/admin_actions.py index 2e75e7237..8ed0827b8 100644 --- a/nova/api/openstack/contrib/admin_actions.py +++ b/nova/api/openstack/contrib/admin_actions.py @@ -52,7 +52,8 @@ class Admin_actions(extensions.ExtensionDescriptor): """Permit Admins to pause the server""" ctxt = req.environ['nova.context'] try: - self.compute_api.pause(ctxt, id) + server = self.compute_api.get(ctxt, id) + self.compute_api.pause(ctxt, server) except Exception: readable = traceback.format_exc() LOG.exception(_("Compute.api::pause %s"), readable) @@ -66,7 +67,8 @@ class Admin_actions(extensions.ExtensionDescriptor): """Permit Admins to unpause the server""" ctxt = req.environ['nova.context'] try: - self.compute_api.unpause(ctxt, id) + server = self.compute_api.get(ctxt, id) + self.compute_api.unpause(ctxt, server) except Exception: readable = traceback.format_exc() LOG.exception(_("Compute.api::unpause %s"), readable) @@ -80,7 +82,8 @@ class Admin_actions(extensions.ExtensionDescriptor): """Permit admins to suspend the server""" context = req.environ['nova.context'] try: - self.compute_api.suspend(context, id) + server = self.compute_api.get(context, id) + self.compute_api.suspend(context, server) except Exception: readable = traceback.format_exc() LOG.exception(_("compute.api::suspend %s"), readable) @@ -94,7 +97,8 @@ class Admin_actions(extensions.ExtensionDescriptor): """Permit admins to resume the server from suspend""" context = req.environ['nova.context'] try: - self.compute_api.resume(context, id) + server = self.compute_api.get(context, id) + self.compute_api.resume(context, server) except Exception: readable = traceback.format_exc() LOG.exception(_("compute.api::resume %s"), readable) |