diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-12-05 22:36:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-12-05 22:36:14 +0000 |
| commit | 255a27333092be0523949bd624c94b740515d018 (patch) | |
| tree | 1df45535437ca09f72b435dce502cc66093c27e8 | |
| parent | ea7ced276d2f080718cd89f3a77378cdf24fabf5 (diff) | |
| parent | 3f8df660030a078db2c295e7ae74a32c88c7af02 (diff) | |
| download | oslo-255a27333092be0523949bd624c94b740515d018.tar.gz oslo-255a27333092be0523949bd624c94b740515d018.tar.xz oslo-255a27333092be0523949bd624c94b740515d018.zip | |
Merge "Fix qpid cast_to_server regression."
| -rw-r--r-- | openstack/common/rpc/impl_qpid.py | 7 | ||||
| -rw-r--r-- | tests/unit/rpc/test_qpid.py | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/openstack/common/rpc/impl_qpid.py b/openstack/common/rpc/impl_qpid.py index fc8a382..7f21461 100644 --- a/openstack/common/rpc/impl_qpid.py +++ b/openstack/common/rpc/impl_qpid.py @@ -279,6 +279,13 @@ class Connection(object): self.consumer_thread = None self.conf = conf + if server_params and 'hostname' in server_params: + # NOTE(russellb) This enables support for cast_to_server. + server_params['qpid_hosts'] = [ + '%s:%d' % (server_params['hostname'], + server_params.get('port', 5672)) + ] + params = { 'qpid_hosts': self.conf.qpid_hosts, 'username': self.conf.qpid_username, diff --git a/tests/unit/rpc/test_qpid.py b/tests/unit/rpc/test_qpid.py index 1f1a595..ad779f3 100644 --- a/tests/unit/rpc/test_qpid.py +++ b/tests/unit/rpc/test_qpid.py @@ -289,9 +289,9 @@ class RpcQpidTestCase(unittest.TestCase): server_params['username']) self.assertEqual(myself.connection.password, server_params['password']) - self.assertEqual(myself.broker, - server_params['hostname'] + ':' + - str(server_params['port'])) + self.assertEqual(myself.brokers, + [server_params['hostname'] + ':' + + str(server_params['port'])]) MyConnection.pool = rpc_amqp.Pool(FLAGS, MyConnection) self.stubs.Set(impl_qpid, 'Connection', MyConnection) |