diff options
| author | Mehdi Abaakouk <mehdi.abaakouk@enovance.com> | 2013-10-23 13:51:35 +0200 |
|---|---|---|
| committer | Mathieu Gagné <mgagne@iweb.com> | 2014-03-12 13:58:01 -0400 |
| commit | 0a1db090c4badf25c85bf03c75ad6f104ac51e81 (patch) | |
| tree | b4f4e238fe1577a033efba5d1c13a9ee8a2793f8 | |
| parent | 41a26ea2ab2afe4617443c6fd32452437394c27f (diff) | |
| download | ceilometer-0a1db090c4badf25c85bf03c75ad6f104ac51e81.tar.gz | |
Fix the default rpc policy value
Before, each time a service that use ceilometer.publisher.rpc start this
annoying message appear because the default value is not the correct.
WARNING ceilometer.publisher.rpc [-] Publishing policy is unknown (wait) force to default
WARNING ceilometer.publisher.rpc [-] Publishing policy is unknown (wait) force to default
This patch set the correct default (to default inteads of wait), and check in tests
that the expected logger method is called.
Fixes bug #1245965
Change-Id: I41b9461359c7b0b17eb8e9dad1772bafdc3554fc
(cherry picked from commit 30ecd2f76633b8854401c6254210aaa5a7920be0)
| -rw-r--r-- | ceilometer/publisher/rpc.py | 2 | ||||
| -rw-r--r-- | tests/publisher/test_rpc_publisher.py | 17 |
2 files changed, 14 insertions, 5 deletions
diff --git a/ceilometer/publisher/rpc.py b/ceilometer/publisher/rpc.py index c0ae3c5c..f3ab83fd 100644 --- a/ceilometer/publisher/rpc.py +++ b/ceilometer/publisher/rpc.py @@ -147,7 +147,7 @@ class RPCPublisher(publisher.PublisherBase): self.target = options.get('target', ['record_metering_data'])[0] - self.policy = options.get('policy', ['wait'])[-1] + self.policy = options.get('policy', ['default'])[-1] self.max_queue_length = int(options.get( 'max_queue_length', [1024])[-1]) diff --git a/tests/publisher/test_rpc_publisher.py b/tests/publisher/test_rpc_publisher.py index 38ba97c2..febd947f 100644 --- a/tests/publisher/test_rpc_publisher.py +++ b/tests/publisher/test_rpc_publisher.py @@ -19,10 +19,12 @@ """Tests for ceilometer/publish.py """ -import eventlet import datetime from oslo.config import cfg +import eventlet +import mock + from ceilometer import sample from ceilometer.openstack.common import jsonutils from ceilometer.openstack.common import network_utils @@ -307,10 +309,13 @@ class TestPublish(base.TestCase): self.assertEqual(len(self.published), 2) self.assertEqual(len(publisher.local_queue), 0) - def test_published_with_no_policy(self): + @mock.patch('ceilometer.publisher.rpc.LOG') + def test_published_with_no_policy(self, mylog): self.rpc_unreachable = True publisher = rpc.RPCPublisher( network_utils.urlsplit('rpc://')) + self.assertTrue(mylog.info.called) + self.assertRaises( SystemExit, publisher.publish_samples, @@ -319,10 +324,12 @@ class TestPublish(base.TestCase): self.assertEqual(len(self.published), 0) self.assertEqual(len(publisher.local_queue), 0) - def test_published_with_policy_block(self): + @mock.patch('ceilometer.publisher.rpc.LOG') + def test_published_with_policy_block(self, mylog): self.rpc_unreachable = True publisher = rpc.RPCPublisher( network_utils.urlsplit('rpc://?policy=default')) + self.assertTrue(mylog.info.called) self.assertRaises( SystemExit, publisher.publish_samples, @@ -330,7 +337,8 @@ class TestPublish(base.TestCase): self.assertEqual(len(self.published), 0) self.assertEqual(len(publisher.local_queue), 0) - def test_published_with_policy_incorrect(self): + @mock.patch('ceilometer.publisher.rpc.LOG') + def test_published_with_policy_incorrect(self, mylog): self.rpc_unreachable = True publisher = rpc.RPCPublisher( network_utils.urlsplit('rpc://?policy=notexist')) @@ -338,6 +346,7 @@ class TestPublish(base.TestCase): SystemExit, publisher.publish_samples, None, self.test_data) + self.assertTrue(mylog.warn.called) self.assertEqual(publisher.policy, 'default') self.assertEqual(len(self.published), 0) self.assertEqual(len(publisher.local_queue), 0) |