summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJosh Kearney <josh.kearney@rackspace.com>2011-01-07 01:19:22 +0000
committerTarmac <>2011-01-07 01:19:22 +0000
commite33102d23ec8f357c08e2583f8d9e3c1753bab4d (patch)
tree8d31f31a6f5bb5f13e69d04f37c8549bc9a98400 /nova/api
parentae5dbe2b5d4871d3e26e859c03feab705c9c59ea (diff)
parent59f8986df4d78f61528162e65f560064febef7af (diff)
downloadnova-e33102d23ec8f357c08e2583f8d9e3c1753bab4d.tar.gz
nova-e33102d23ec8f357c08e2583f8d9e3c1753bab4d.tar.xz
nova-e33102d23ec8f357c08e2583f8d9e3c1753bab4d.zip
Include date in API action query.
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/servers.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index f8d5e7685..10679ccb6 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -266,4 +266,13 @@ class Controller(wsgi.Controller):
def actions(self, req, id):
"""Permit Admins to retrieve server actions."""
ctxt = req.environ["nova.context"]
- return self.compute_api.get_actions(ctxt, id)
+ 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:
+ actions.append(dict(
+ created_at=str(item.created_at),
+ action=item.action,
+ error=item.error))
+ return dict(actions=actions)