diff options
| author | Josh Kearney <josh.kearney@rackspace.com> | 2011-01-06 15:33:01 -0600 |
|---|---|---|
| committer | Josh Kearney <josh.kearney@rackspace.com> | 2011-01-06 15:33:01 -0600 |
| commit | 19db369868b2f4a200624cb67d72740eabaab699 (patch) | |
| tree | a08f57c1efe620eea69a2eea171a24145c99972d | |
| parent | 473e692e60fe32b261f67c365bb813419029ad71 (diff) | |
| download | nova-19db369868b2f4a200624cb67d72740eabaab699.tar.gz nova-19db369868b2f4a200624cb67d72740eabaab699.tar.xz nova-19db369868b2f4a200624cb67d72740eabaab699.zip | |
Include date in action query
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 9 |
1 files 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) ################### |
