Merge "Implement get_host_uptime in libvirt driver."

2 files changed, 11 insertions, 0 deletions

diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
index b1359323b..52cec9ebc 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -2682,6 +2682,10 @@ class HostStateTestCase(test.TestCase):
         def get_hypervisor_hostname(self):
             return 'compute1'
 
+        def get_host_uptime(self):
+            return ('10:01:16 up  1:36,  6 users,  '
+                    'load average: 0.21, 0.16, 0.19')
+
         def get_disk_available_least(self):
             return 13091
 
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
index 2ca5c2edf..75f157b9c 100644
--- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py
@@ -2720,6 +2720,13 @@ class LibvirtDriver(driver.ComputeDriver):
         """Sets the specified host's ability to accept new instances."""
         pass
 
+    def get_host_uptime(self, host):
+        """Returns the result of calling "uptime"."""
+        #NOTE(dprince): host seems to be ignored for this call and in
+        # other compute drivers as well. Perhaps we should remove it?
+        out, err = utils.execute('env', 'LANG=C', 'uptime')
+        return out
+
     def manage_image_cache(self, context):
         """Manage the local cache of images."""
         self.image_cache_manager.verify_base_images(context)