Merge "Implement get_hypervisor_hostname for libvirt."

3 files changed, 13 insertions, 0 deletions

diff --git a/nova/tests/fakelibvirt.py b/nova/tests/fakelibvirt.py
index 5a317dca1..693330408 100644
--- a/nova/tests/fakelibvirt.py
+++ b/nova/tests/fakelibvirt.py
@@ -507,6 +507,9 @@ class Connection(object):
     def getVersion(self):
         return 14000
 
+    def getHostname(self):
+        return 'compute1'
+
     def getCapabilities(self):
         return '''<capabilities>
   <host>
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
index 42dfdbfa7..d70618807 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -1696,6 +1696,9 @@ class HostStateTestCase(test.TestCase):
         def get_hypervisor_version(self):
             return 13091
 
+        def get_hypervisor_hostname(self):
+            return 'compute1'
+
         def get_disk_available_least(self):
             return 13091
 
@@ -1722,6 +1725,7 @@ class HostStateTestCase(test.TestCase):
         self.assertEquals(stats["host_memory_free"], 409)
         self.assertEquals(stats["hypervisor_type"], 'QEMU')
         self.assertEquals(stats["hypervisor_version"], 13091)
+        self.assertEquals(stats["hypervisor_hostname"], 'compute1')
 
 
 class NWFilterFakes:
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index a7c14cd65..23429e84d 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -1944,6 +1944,10 @@ class LibvirtConnection(driver.ComputeDriver):
 
         return method()
 
+    def get_hypervisor_hostname(self):
+        """Returns the hostname of the hypervisor."""
+        return self._conn.getHostname()
+
     def get_cpu_info(self):
         """Get cpuinfo information.
 
@@ -2055,6 +2059,7 @@ class LibvirtConnection(driver.ComputeDriver):
                'local_gb_used': self.get_local_gb_used(),
                'hypervisor_type': self.get_hypervisor_type(),
                'hypervisor_version': self.get_hypervisor_version(),
+               'hypervisor_hostname': self.get_hypervisor_hostname(),
                'cpu_info': self.get_cpu_info(),
                'service_id': service_ref['id'],
                'disk_available_least': self.get_disk_available_least()}
@@ -2637,6 +2642,7 @@ class HostState(object):
                                     self.connection.get_memory_mb_used())
         data["hypervisor_type"] = self.connection.get_hypervisor_type()
         data["hypervisor_version"] = self.connection.get_hypervisor_version()
+        data["hypervisor_hostname"] = self.connection.get_hypervisor_hostname()
 
         self._stats = data