Merge "Improve the liveness checking for services"

2011-10-26 01:01:00 +00:00 · 2011-10-26 01:01:00 +00:00 · 607fd1274f
commit 607fd1274f
parent c8dcda63bd 2fc769e1d8
1 changed files with 9 additions and 0 deletions
--- 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