From 59f8986df4d78f61528162e65f560064febef7af Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh.kearney@rackspace.com>
Date: Thu, 6 Jan 2011 18:59:15 -0600
Subject: Review feedback

---
 nova/api/openstack/servers.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'nova/api')

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)
-- 
cgit