From 6859f5e843a3a0cbee644661ca8b9cb1c88894a0 Mon Sep 17 00:00:00 2001
From: Tiago Mello <tmello@linux.vnet.ibm.com>
Date: Mon, 21 Jan 2013 20:01:40 -0200
Subject: Fixes task_log_get and task_log_get_all signatures

Fixes signatures for the above methods in nova/db/api.py
based on the recent TaskLog refactor on sqlalchemy/api.py.
Also adds unit tests for TaskLog.

Fixes Bug 1102652.

Change-Id: Id7ce74b8941d9eb6a50dfbfaa62e0fe05dd467c2
---
 nova/db/api.py            | 20 ++++++++------------
 nova/db/sqlalchemy/api.py |  8 ++++----
 2 files changed, 12 insertions(+), 16 deletions(-)

(limited to 'nova/db')

diff --git a/nova/db/api.py b/nova/db/api.py
index d8a16c52d..6af81e5f9 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -1705,16 +1705,14 @@ def task_log_end_task(context, task_name,
                         period_ending,
                         host,
                         errors,
-                        message=None,
-                        session=None):
+                        message=None):
     """Mark a task as complete for a given host/time period."""
     return IMPL.task_log_end_task(context, task_name,
                                   period_beginning,
                                   period_ending,
                                   host,
                                   errors,
-                                  message,
-                                  session)
+                                  message)
 
 
 def task_log_begin_task(context, task_name,
@@ -1722,25 +1720,23 @@ def task_log_begin_task(context, task_name,
                         period_ending,
                         host,
                         task_items=None,
-                        message=None,
-                        session=None):
+                        message=None):
     """Mark a task as started for a given host/time period."""
     return IMPL.task_log_begin_task(context, task_name,
                                     period_beginning,
                                     period_ending,
                                     host,
                                     task_items,
-                                    message,
-                                    session)
+                                    message)
 
 
 def task_log_get_all(context, task_name, period_beginning,
-                 period_ending, host=None, state=None, session=None):
+                 period_ending, host=None, state=None):
     return IMPL.task_log_get_all(context, task_name, period_beginning,
-                 period_ending, host, state, session)
+                 period_ending, host, state)
 
 
 def task_log_get(context, task_name, period_beginning,
-                 period_ending, host, state=None, session=None):
+                 period_ending, host, state=None):
     return IMPL.task_log_get(context, task_name, period_beginning,
-                 period_ending, host, state, session)
+                 period_ending, host, state)
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index dff2e6b81..d6f093f5b 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -4770,15 +4770,15 @@ def _task_log_get_query(context, task_name, period_beginning,
 @require_admin_context
 def task_log_get(context, task_name, period_beginning, period_ending, host,
                  state=None):
-    return _task_log_get_query(task_name, period_beginning, period_ending,
-                               host, state).first()
+    return _task_log_get_query(context, task_name, period_beginning,
+                               period_ending, host, state).first()
 
 
 @require_admin_context
 def task_log_get_all(context, task_name, period_beginning, period_ending,
                      host=None, state=None):
-    return _task_log_get_query(task_name, period_beginning, period_ending,
-                               host, state).all()
+    return _task_log_get_query(context, task_name, period_beginning,
+                               period_ending, host, state).all()
 
 
 @require_admin_context
-- 
cgit