From 2ef03c6a0a8c5705249c3b5be755e0a13ca39332 Mon Sep 17 00:00:00 2001
From: Dan Prince <dan.prince@rackspace.com>
Date: Mon, 18 Apr 2011 22:02:54 -0400
Subject: Implement get_host_ip_addr in the libvirt compute driver.

---
 nova/tests/test_virt.py   | 12 ++++++++++++
 nova/virt/libvirt_conn.py |  6 ++++++
 2 files changed, 18 insertions(+)

diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py
index aeaea91c7..d97801484 100644
--- a/nova/tests/test_virt.py
+++ b/nova/tests/test_virt.py
@@ -18,6 +18,7 @@ import eventlet
 import mox
 import os
 import re
+import socket
 import sys
 
 from xml.etree.ElementTree import fromstring as xml_to_tree
@@ -549,6 +550,17 @@ class LibvirtConnTestCase(test.TestCase):
         db.volume_destroy(self.context, volume_ref['id'])
         db.instance_destroy(self.context, instance_ref['id'])
 
+    def test_get_host_ip_addr(self):
+
+        def getHostname():
+            return socket.gethostname()
+
+        self.create_fake_libvirt_mock(getHostname=getHostname)
+        self.mox.ReplayAll()
+        conn = libvirt_conn.LibvirtConnection(False)
+        ip = conn.get_host_ip_addr()
+        self.assertTrue(ip is not None)
+
     def tearDown(self):
         self.manager.delete_project(self.project)
         self.manager.delete_user(self.user)
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index d212be3c9..511bfde36 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -40,6 +40,7 @@ import multiprocessing
 import os
 import random
 import shutil
+import socket
 import subprocess
 import sys
 import tempfile
@@ -732,6 +733,11 @@ class LibvirtConnection(driver.ComputeDriver):
         subprocess.Popen(cmd, shell=True)
         return {'token': token, 'host': host, 'port': port}
 
+    def get_host_ip_addr(self):
+        hostname = self._conn.getHostname()
+        ip = socket.gethostbyname(hostname)
+        return ip
+
     @exception.wrap_exception
     def get_vnc_console(self, instance):
         def get_vnc_port_for_instance(instance_name):
-- 
cgit 


From 3be272f432b4385cf77787416762a360687a36bd Mon Sep 17 00:00:00 2001
From: Dan Prince <dan.prince@rackspace.com>
Date: Mon, 2 May 2011 10:17:51 -0400
Subject: Use my_ip for libvirt version of get_host_ip_addr.

---
 nova/tests/test_virt.py   | 5 +++++
 nova/virt/libvirt_conn.py | 5 +----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py
index 462cf5aa0..9305de4ca 100644
--- a/nova/tests/test_virt.py
+++ b/nova/tests/test_virt.py
@@ -641,6 +641,11 @@ class LibvirtConnTestCase(test.TestCase):
 
         self.assertTrue(count)
 
+    def test_get_host_ip_addr(self):
+        conn = libvirt_conn.LibvirtConnection(False)
+        ip = conn.get_host_ip_addr()
+        self.assertEquals(ip, FLAGS.my_ip)
+
     def tearDown(self):
         self.manager.delete_project(self.project)
         self.manager.delete_user(self.user)
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 6b56622ff..a62deb4a6 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -40,7 +40,6 @@ import multiprocessing
 import os
 import random
 import shutil
-import socket
 import subprocess
 import sys
 import tempfile
@@ -737,9 +736,7 @@ class LibvirtConnection(driver.ComputeDriver):
         return {'token': token, 'host': host, 'port': port}
 
     def get_host_ip_addr(self):
-        hostname = self._conn.getHostname()
-        ip = socket.gethostbyname(hostname)
-        return ip
+        return FLAGS.my_ip
 
     @exception.wrap_exception
     def get_vnc_console(self, instance):
-- 
cgit