summaryrefslogtreecommitdiffstats
path: root/nova/utils.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2011-10-26 01:01:00 +0000
committerGerrit Code Review <review@openstack.org>2011-10-26 01:01:00 +0000
commit7cd3d73bc8729c00b739166e92050b659dd4602e (patch)
tree873afac2ddcb39ab8a0a41a1c29525ddc71d613d /nova/utils.py
parentace2628dfa6048a8e8b7757daefffc1987cfad3f (diff)
parentad74424768463cd6ad02dd9d6fdf64fc7b3bbafb (diff)
Merge "Improve the liveness checking for services"
Diffstat (limited to 'nova/utils.py')
-rw-r--r--nova/utils.py9
1 files changed, 9 insertions, 0 deletions
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