From 43fb6880d90197735b0b9bf4587fcece825c1ed0 Mon Sep 17 00:00:00 2001 From: Alex Meade Date: Thu, 10 Nov 2011 15:52:04 -0500 Subject: Convert pause/unpause, sus/res to use instance obj Related to blueprint internal-uuids Change-Id: I02bd212b4878ed0fcb971c223518ecf7126bd597 --- nova/api/openstack/contrib/admin_actions.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'nova/api') 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) -- cgit