diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-02-04 16:37:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-02-04 16:37:14 +0000 |
| commit | bd52d08efaa608244254a801c9737a0aed7434e0 (patch) | |
| tree | ed9f3b81860a5caa72073b6d34724bacf7814e57 | |
| parent | 4b022126b56bf5f93a528641ddb703cc2610bb0b (diff) | |
| parent | 8eed6bbd0953585353a4128112ba98ea99480c0c (diff) | |
| download | oslo-messaging-bd52d08efaa608244254a801c9737a0aed7434e0.tar.gz | |
Merge "Make sure zmq can work with redis"
| -rw-r--r-- | oslo_messaging/_drivers/matchmaker_redis.py | 2 | ||||
| -rw-r--r-- | tests/drivers/test_matchmaker_redis.py | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/oslo_messaging/_drivers/matchmaker_redis.py b/oslo_messaging/_drivers/matchmaker_redis.py index f77b755..4ba5447 100644 --- a/oslo_messaging/_drivers/matchmaker_redis.py +++ b/oslo_messaging/_drivers/matchmaker_redis.py @@ -128,7 +128,7 @@ class MatchMakerRedis(mm_common.HeartbeatMatchMakerBase): # No value is needed, we just # care if it exists. Sets aren't viable # because only keys can expire. - pipe.set(key_host, '') + pipe.sadd(key_host, '') pipe.execute() diff --git a/tests/drivers/test_matchmaker_redis.py b/tests/drivers/test_matchmaker_redis.py index 95bde9e..a36e14a 100644 --- a/tests/drivers/test_matchmaker_redis.py +++ b/tests/drivers/test_matchmaker_redis.py @@ -46,6 +46,7 @@ class RedisMatchMakerTest(test_utils.BaseTestCase): "network": ["controller1", "node1", "node2", "node3"], "cert": ["controller1"], "console": ["controller1"], + "l3_agent.node1": ["node1"], "consoleauth": ["controller1"]} self.matcher = matchmaker_redis.MatchMakerRedis() self.populate() @@ -70,6 +71,10 @@ class RedisMatchMakerTest(test_utils.BaseTestCase): self.assertEqual( sorted(self.matcher.redis.smembers('cert')), ['cert.controller1', 'cert.keymaster']) + self.matcher.register('l3_agent.node1', 'node1') + self.assertEqual( + sorted(self.matcher.redis.smembers('l3_agent.node1')), + ['l3_agent.node1.node1']) def test_unregister(self): self.matcher.unregister('conductor', 'controller1') |