From 5aca2e2df66c124696589ed3d45aae218fe2c91e Mon Sep 17 00:00:00 2001 From: Zhongyue Luo Date: Wed, 23 May 2012 22:17:35 +0800 Subject: Use utils.utcnow rather than datetime.utcnow Fixes bug #1003587 Edit direct use of datetime.utcnow or datetime.now to utilize utils.utcnow Change-Id: I1130f6e664f252fc5da7304f495dc9f980721224 --- nova/db/sqlalchemy/api.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'nova/db') diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 5386b0f41..9f43d1045 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1592,8 +1592,7 @@ def instance_get_floating_address(context, instance_id): @require_admin_context def instance_get_all_hung_in_rebooting(context, reboot_window, session=None): - reboot_window = datetime.datetime.utcnow() - datetime.timedelta( - seconds=reboot_window) + reboot_window = utils.utcnow() - datetime.timedelta(seconds=reboot_window) if not session: session = get_session() @@ -3775,8 +3774,8 @@ def migration_get_by_instance_and_status(context, instance_uuid, status): @require_admin_context def migration_get_all_unconfirmed(context, confirm_window, session=None): - confirm_window = datetime.datetime.utcnow() - datetime.timedelta( - seconds=confirm_window) + confirm_window = (utils.utcnow() - + datetime.timedelta(seconds=confirm_window)) return model_query(context, models.Migration, session=session, read_deleted="yes").\ -- cgit