diff options
| author | Josh Kearney <josh.kearney@rackspace.com> | 2011-01-06 18:59:15 -0600 |
|---|---|---|
| committer | Josh Kearney <josh.kearney@rackspace.com> | 2011-01-06 18:59:15 -0600 |
| commit | 59f8986df4d78f61528162e65f560064febef7af (patch) | |
| tree | f6261ff549dea3556138be0cea3456fc4df654c0 /nova/api | |
| parent | a0edf5a7ba372419ebfed987b8585171e7167e48 (diff) | |
| download | nova-59f8986df4d78f61528162e65f560064febef7af.tar.gz nova-59f8986df4d78f61528162e65f560064febef7af.tar.xz nova-59f8986df4d78f61528162e65f560064febef7af.zip | |
Review feedback
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/servers.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index 3ee161502..9a0c417ae 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -223,8 +223,12 @@ class Controller(wsgi.Controller): """Permit Admins to retrieve server actions.""" ctxt = req.environ["nova.context"] items = self.compute_api.get_actions(ctxt, id) + actions = [] # TODO(jk0): Do not do pre-serialization here once the default # serializer is updated for item in items: - item["created_at"] = str(item["created_at"]) - return dict(actions=items) + actions.append(dict( + created_at=str(item.created_at), + action=item.action, + error=item.error)) + return dict(actions=actions) |