From 4a76167e354eed4aa98232fbf6c845f86ce4cf22 Mon Sep 17 00:00:00 2001 From: Ewan Mellor Date: Sun, 27 Nov 2011 23:26:49 -0800 Subject: Bug #897091: "nova actions" fails with HTTP 400 / TypeError if a server action has been performed Fix code in Controller.action that was overwriting the definition of the actions method with a dictionary. This meant that 'nova actions' would fail if 'nova reboot' had previously been called. Added two tests, one for the actions call in general, and one for this failure mode specifically. Change-Id: I695bb5c4dcfba96a5aba54125a8f3163e1a6a193 --- nova/api/openstack/v2/servers.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'nova/api') diff --git a/nova/api/openstack/v2/servers.py b/nova/api/openstack/v2/servers.py index 144566d33..5066633be 100644 --- a/nova/api/openstack/v2/servers.py +++ b/nova/api/openstack/v2/servers.py @@ -506,7 +506,7 @@ class Controller(wsgi.Controller): @scheduler_api.redirect_handler def action(self, req, id, body): """Multi-purpose method used to take actions on a server""" - self.actions = { + _actions = { 'changePassword': self._action_change_password, 'reboot': self._action_reboot, 'resize': self._action_resize, @@ -520,11 +520,11 @@ class Controller(wsgi.Controller): admin_actions = { 'createBackup': self._action_create_backup, } - self.actions.update(admin_actions) + _actions.update(admin_actions) for key in body: - if key in self.actions: - return self.actions[key](body, req, id) + if key in _actions: + return _actions[key](body, req, id) else: msg = _("There is no such server action: %s") % (key,) raise exc.HTTPBadRequest(explanation=msg) -- cgit