diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-05 21:24:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-05 21:24:05 +0000 |
| commit | 4ba119c8f108b3e26e29a577b0d0085e47488a70 (patch) | |
| tree | 7b1fea56d6d69746ce5c87318e228c31a9f68cd1 | |
| parent | 37ada8bdb190f8e043003a41f67fff706cde332b (diff) | |
| parent | 2f7503372467d9998b67e2c58ffaf51733329944 (diff) | |
| download | oslo-4ba119c8f108b3e26e29a577b0d0085e47488a70.tar.gz oslo-4ba119c8f108b3e26e29a577b0d0085e47488a70.tar.xz oslo-4ba119c8f108b3e26e29a577b0d0085e47488a70.zip | |
Merge "Tweak rpc.queue_get_for to deal with host=None."
| -rw-r--r-- | openstack/common/rpc/__init__.py | 2 | ||||
| -rw-r--r-- | tests/unit/rpc/test_common.py | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/openstack/common/rpc/__init__.py b/openstack/common/rpc/__init__.py index da45d5a..f84c493 100644 --- a/openstack/common/rpc/__init__.py +++ b/openstack/common/rpc/__init__.py @@ -250,7 +250,7 @@ def queue_get_for(context, topic, host): Messages sent to the 'foo.<host>' topic are sent to the nova-foo service on <host>. """ - return '%s.%s' % (topic, host) + return '%s.%s' % (topic, host) if host else topic _RPCIMPL = None diff --git a/tests/unit/rpc/test_common.py b/tests/unit/rpc/test_common.py index 2066a64..80b717b 100644 --- a/tests/unit/rpc/test_common.py +++ b/tests/unit/rpc/test_common.py @@ -167,3 +167,7 @@ class RpcCommonTestCase(test_utils.BaseTestCase): importutils.import_module = orig_import_module self.assertEqual(self.mod, 'nova.openstack.common.rpc.impl_qpid') + + def test_queue_get_for(self): + self.assertEqual(rpc.queue_get_for(None, 'a', 'b'), 'a.b') + self.assertEqual(rpc.queue_get_for(None, 'a', None), 'a') |