From 19db369868b2f4a200624cb67d72740eabaab699 Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh.kearney@rackspace.com>
Date: Thu, 6 Jan 2011 15:33:01 -0600
Subject: Include date in action query

---
 nova/db/sqlalchemy/api.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index aaa07e3c9..003a96b75 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -840,12 +840,15 @@ 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 = {}
+    actions = []
     for action in session.query(models.InstanceActions).\
         filter_by(instance_id=instance_id).\
         all():
-        actions[action.action] = action.error
-    return actions
+        actions.append(dict(
+            date=action.created_at.ctime(),
+            action=action.action,
+            error=action.error))
+    return dict(actions=actions)
 
 
 ###################
-- 
cgit