Merge "Enhance wsgi to listen on ipv6 address"

2 files changed, 17 insertions, 0 deletions

diff --git a/nova/tests/test_service.py b/nova/tests/test_service.py
index 2d98a2641..0bb57d542 100644
--- a/nova/tests/test_service.py
+++ b/nova/tests/test_service.py
@@ -182,6 +182,14 @@ class TestWSGIService(test.TestCase):
         self.assertNotEqual(0, test_service.port)
         test_service.stop()
 
+    def test_service_random_port_with_ipv6(self):
+        CONF.set_default("test_service_listen", "::1")
+        test_service = service.WSGIService("test_service")
+        test_service.start()
+        self.assertEqual("::1", test_service.host)
+        self.assertNotEqual(0, test_service.port)
+        test_service.stop()
+
 
 class TestLauncher(test.TestCase):
 
diff --git a/nova/tests/test_wsgi.py b/nova/tests/test_wsgi.py
index eda735cae..b4b25ed97 100644
--- a/nova/tests/test_wsgi.py
+++ b/nova/tests/test_wsgi.py
@@ -90,3 +90,12 @@ class TestWSGIServer(test.TestCase):
         self.assertNotEqual(0, server.port)
         server.stop()
         server.wait()
+
+    def test_start_random_port_with_ipv6(self):
+        server = nova.wsgi.Server("test_random_port", None,
+            host="::1", port=0)
+        server.start()
+        self.assertEqual("::1", server.host)
+        self.assertNotEqual(0, server.port)
+        server.stop()
+        server.wait()