From ad74424768463cd6ad02dd9d6fdf64fc7b3bbafb Mon Sep 17 00:00:00 2001
From: David Subiros <david.perez5@hp.com>
Date: Fri, 5 Aug 2011 16:35:56 +0100
Subject: Improve the liveness checking for services

With this modification both nova-manage and scheduler use the flag
service_down_time and check positive and negative values in a
correct way.
Fixes bug: 867674.

Change-Id: I15c48d80cafa2089cd228c09c61b0a1e513730e8
---
 nova/utils.py | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'nova/utils.py')

diff --git a/nova/utils.py b/nova/utils.py
index 7d34a87d8..ad585ba1c 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -1009,3 +1009,12 @@ def make_dev_path(dev, partition=None, base='/dev'):
     if partition:
         path += str(partition)
     return path
+
+
+def total_seconds(td):
+    """Local total_seconds implementation for compatibility with python 2.6"""
+    if hasattr(td, 'total_seconds'):
+        return td.total_seconds()
+    else:
+        return ((td.days * 86400 + td.seconds) * 10 ** 6 +
+                td.microseconds) / 10.0 ** 6
-- 
cgit