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 ++++++--
 nova/db/sqlalchemy/api.py     | 10 ++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'nova')

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)
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 1b6e89541..45427597a 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -840,15 +840,9 @@ def instance_action_create(context, values):
 def instance_get_actions(context, instance_id):
     """Return the actions associated to the given instance id"""
     session = get_session()
-    actions = []
-    for action in session.query(models.InstanceActions).\
+    return session.query(models.InstanceActions).\
         filter_by(instance_id=instance_id).\
-        all():
-        actions.append(dict(
-            created_at=action.created_at,
-            action=action.action,
-            error=action.error))
-    return actions
+        all()
 
 
 ###################
-- 
cgit