Merge "Escape IPv6 address in square brackets"

zaqar/tests/unit/transport/websocket/test_protocol.py

@@ -19,6 +19,7 @@ import ddt
 import mock
 
 from oslo_utils import uuidutils
+import zaqar
 from zaqar.tests.unit.transport.websocket import base
 from zaqar.tests.unit.transport.websocket import utils as test_utils
 
@@ -92,3 +93,15 @@ class TestMessagingProtocol(base.TestBase):
         self.protocol.onMessage(req, in_binary)
         resp = loads(send_mock.call_args[0][0])
         self.assertEqual(200, resp['headers']['status'])
+
+    @mock.patch.object(zaqar.transport.websocket.factory, 'ProtocolFactory')
+    def test_ipv6_escaped(self, mock_pf):
+        delattr(self.transport, '_lazy_factory')
+        self.transport.factory()
+        self.assertEqual('ws://127.0.0.1:9000', mock_pf.mock_calls[0][1][0])
+
+        mock_pf.reset_mock()
+        with mock.patch.object(self.transport._ws_conf, 'bind', "1::4"):
+            delattr(self.transport, '_lazy_factory')
+            self.transport.factory()
+            self.assertEqual('ws://[1::4]:9000', mock_pf.mock_calls[0][1][0])

zaqar/transport/websocket/driver.py

@@ -17,6 +17,7 @@ import socket
 
 from oslo_config import cfg
 from oslo_log import log as logging
+from oslo_utils import netutils
 
 try:
     import asyncio
@@ -59,6 +60,14 @@ def _config_options():
     return [(_WS_GROUP, _WS_OPTIONS)]
 
 
+# TODO(derekh): use escape_ipv6 from oslo.utils once available
+def _escape_ipv6(address):
+    """Escape an IP address in square brackets if IPv6"""
+    if netutils.is_valid_ipv6(address):
+        return "[%s]" % address
+    return address
+
+
 class Driver(base.DriverBase):
 
     def __init__(self, conf, api, cache):
@@ -78,7 +87,8 @@ class Driver(base.DriverBase):
 
     @decorators.lazy_property(write=False)
     def factory(self):
-        uri = 'ws://' + self._ws_conf.bind + ':' + str(self._ws_conf.port)
+        uri = 'ws://' + _escape_ipv6(self._ws_conf.bind) + ':' + \
+              str(self._ws_conf.port)
         return factory.ProtocolFactory(
             uri,
             handler=self._api,