From dec5171a4d74a3c8097d5a4bb4e22ab7d3f4b584 Mon Sep 17 00:00:00 2001 From: Mehdi Abaakouk Date: Tue, 20 Aug 2013 17:41:11 +0200 Subject: [PATCH] Use samples vocable in cm.publisher.test This change use samples vocable in cm.publisher.test Parts of the blueprint remove-counter Change-Id: Ie9386a99bd78aa32c09e35ffac6e474aba4d09cf --- ceilometer/publisher/test.py | 10 +-- tests/agentbase.py | 24 +++---- tests/compute/test_manager.py | 10 +-- tests/test_notifier.py | 6 +- tests/test_pipeline.py | 126 +++++++++++++++++----------------- 5 files changed, 88 insertions(+), 88 deletions(-) diff --git a/ceilometer/publisher/test.py b/ceilometer/publisher/test.py index 52659f2c..37fbeb47 100644 --- a/ceilometer/publisher/test.py +++ b/ceilometer/publisher/test.py @@ -15,7 +15,7 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -"""Publish a counter in memory, useful for testing +"""Publish a sample in memory, useful for testing """ from ceilometer import publisher @@ -25,14 +25,14 @@ class TestPublisher(publisher.PublisherBase): """Publisher used in unit testing.""" def __init__(self, parsed_url): - self.counters = [] + self.samples = [] self.calls = 0 - def publish_samples(self, context, counters): + def publish_samples(self, context, samples): """Send a metering message for publishing :param context: Execution context from the service or RPC call - :param counter: Counter from pipeline after transformation + :param samples: Samples from pipeline after transformation """ - self.counters.extend(counters) + self.samples.extend(samples) self.calls += 1 diff --git a/tests/agentbase.py b/tests/agentbase.py index f7b933a4..7e8263b7 100644 --- a/tests/agentbase.py +++ b/tests/agentbase.py @@ -49,7 +49,7 @@ class TestPollster: test_data = default_test_data def get_samples(self, manager, cache, instance=None): - self.counters.append((manager, instance)) + self.samples.append((manager, instance)) return [self.test_data] @@ -59,18 +59,18 @@ class TestPollsterException(TestPollster): # by both central manager and compute manager # In future, we possibly don't need such hack if we # combine the get_samples() function again - self.counters.append((manager, instance)) + self.samples.append((manager, instance)) raise Exception() class BaseAgentManagerTestCase(base.TestCase): class Pollster(TestPollster): - counters = [] + samples = [] test_data = default_test_data class PollsterAnother(TestPollster): - counters = [] + samples = [] test_data = sample.Sample( name='testanother', type=default_test_data.type, @@ -83,7 +83,7 @@ class BaseAgentManagerTestCase(base.TestCase): resource_metadata=default_test_data.resource_metadata) class PollsterException(TestPollsterException): - counters = [] + samples = [] test_data = sample.Sample( name='testexception', type=default_test_data.type, @@ -96,7 +96,7 @@ class BaseAgentManagerTestCase(base.TestCase): resource_metadata=default_test_data.resource_metadata) class PollsterExceptionAnother(TestPollsterException): - counters = [] + samples = [] test_data = sample.Sample( name='testexceptionanother', type=default_test_data.type, @@ -163,10 +163,10 @@ class BaseAgentManagerTestCase(base.TestCase): self.setup_pipeline() def tearDown(self): - self.Pollster.counters = [] - self.PollsterAnother.counters = [] - self.PollsterException.counters = [] - self.PollsterExceptionAnother.counters = [] + self.Pollster.samples = [] + self.PollsterAnother.samples = [] + self.PollsterException.samples = [] + self.PollsterExceptionAnother.samples = [] super(BaseAgentManagerTestCase, self).tearDown() def test_setup_polling_tasks(self): @@ -175,7 +175,7 @@ class BaseAgentManagerTestCase(base.TestCase): self.assertTrue(60 in polling_tasks.keys()) self.mgr.interval_task(polling_tasks.values()[0]) pub = self.mgr.pipeline_manager.pipelines[0].publishers[0] - self.assertEqual(pub.counters[0], self.Pollster.test_data) + self.assertEqual(pub.samples[0], self.Pollster.test_data) def test_setup_polling_tasks_multiple_interval(self): self.pipeline_cfg.append({ @@ -244,4 +244,4 @@ class BaseAgentManagerTestCase(base.TestCase): polling_tasks.get(10) self.mgr.interval_task(polling_tasks.get(10)) pub = self.mgr.pipeline_manager.pipelines[0].publishers[0] - self.assertEqual(len(pub.counters), 0) + self.assertEqual(len(pub.samples), 0) diff --git a/tests/compute/test_manager.py b/tests/compute/test_manager.py index 6287422a..02eb6125 100644 --- a/tests/compute/test_manager.py +++ b/tests/compute/test_manager.py @@ -59,15 +59,15 @@ class TestRunTasks(agentbase.BaseAgentManagerTestCase): def test_notifier_task(self): self.mgr.setup_notifier_task() self.mgr.poll_instance(None, self.instance) - self.assertEqual(len(self.Pollster.counters), 1) + self.assertEqual(len(self.Pollster.samples), 1) pub = self.mgr.pipeline_manager.pipelines[0].publishers[0] - self.assertEqual(pub.counters[0], self.Pollster.test_data) + self.assertEqual(pub.samples[0], self.Pollster.test_data) def test_setup_polling_tasks(self): super(TestRunTasks, self).test_setup_polling_tasks() - self.assertTrue(self.Pollster.counters[0][1] is self.instance) + self.assertTrue(self.Pollster.samples[0][1] is self.instance) def test_interval_exception_isolation(self): super(TestRunTasks, self).test_interval_exception_isolation() - self.assertEqual(len(self.PollsterException.counters), 1) - self.assertEqual(len(self.PollsterExceptionAnother.counters), 1) + self.assertEqual(len(self.PollsterException.samples), 1) + self.assertEqual(len(self.PollsterExceptionAnother.samples), 1) diff --git a/tests/test_notifier.py b/tests/test_notifier.py index 048ee0fe..814dca11 100644 --- a/tests/test_notifier.py +++ b/tests/test_notifier.py @@ -81,8 +81,8 @@ class TestNotifier(tests_base.TestCase): transformer_manager) pub = notifier._pipeline_manager.pipelines[0].publishers[0] - self.assertEqual(len(pub.counters), 0) + self.assertEqual(len(pub.samples), 0) notifier.notify(None, MESSAGE) - self.assertTrue(len(pub.counters) > 0) + self.assertTrue(len(pub.samples) > 0) self.assertIn('disk.ephemeral.size', - [c.name for c in pub.counters]) + [c.name for c in pub.samples]) diff --git a/tests/test_pipeline.py b/tests/test_pipeline.py index 6e5c4dd3..ceee6b6f 100644 --- a/tests/test_pipeline.py +++ b/tests/test_pipeline.py @@ -218,9 +218,9 @@ class TestPipeline(base.TestCase): p([self.test_counter]) publisher = pipeline_manager.pipelines[0].publishers[0] - self.assertEqual(len(publisher.counters), 1) + self.assertEqual(len(publisher.samples), 1) self.assertTrue(len(self.TransformerClass.samples) == 1) - self.assertEqual(getattr(publisher.counters[0], "name"), 'a_update') + self.assertEqual(getattr(publisher.samples[0], "name"), 'a_update') self.assertTrue(getattr(self.TransformerClass.samples[0], "name") == 'a') @@ -234,7 +234,7 @@ class TestPipeline(base.TestCase): p([self.test_counter]) publisher = pipeline_manager.pipelines[0].publishers[0] - self.assertEqual(len(publisher.counters), 1) + self.assertEqual(len(publisher.samples), 1) self.test_counter = sample.Sample( name='b', @@ -251,10 +251,10 @@ class TestPipeline(base.TestCase): with pipeline_manager.publisher(None) as p: p([self.test_counter]) - self.assertEqual(len(publisher.counters), 2) + self.assertEqual(len(publisher.samples), 2) self.assertTrue(len(self.TransformerClass.samples) == 2) - self.assertEqual(getattr(publisher.counters[0], "name"), 'a_update') - self.assertEqual(getattr(publisher.counters[1], "name"), 'b_update') + self.assertEqual(getattr(publisher.samples[0], "name"), 'a_update') + self.assertEqual(getattr(publisher.samples[1], "name"), 'b_update') def test_counter_dont_match(self): counter_cfg = ['nomatch'] @@ -265,7 +265,7 @@ class TestPipeline(base.TestCase): p([self.test_counter]) publisher = pipeline_manager.pipelines[0].publishers[0] - self.assertEqual(len(publisher.counters), 0) + self.assertEqual(len(publisher.samples), 0) self.assertEqual(publisher.calls, 0) def test_wildcard_counter(self): @@ -277,9 +277,9 @@ class TestPipeline(base.TestCase): p([self.test_counter]) publisher = pipeline_manager.pipelines[0].publishers[0] - self.assertEqual(len(publisher.counters), 1) + self.assertEqual(len(publisher.samples), 1) self.assertTrue(len(self.TransformerClass.samples) == 1) - self.assertEqual(getattr(publisher.counters[0], "name"), 'a_update') + self.assertEqual(getattr(publisher.samples[0], "name"), 'a_update') def test_wildcard_excluded_counters(self): counter_cfg = ['*', '!a'] @@ -296,9 +296,9 @@ class TestPipeline(base.TestCase): with pipeline_manager.publisher(None) as p: p([self.test_counter]) publisher = pipeline_manager.pipelines[0].publishers[0] - self.assertEqual(len(publisher.counters), 1) + self.assertEqual(len(publisher.samples), 1) self.assertEqual(len(self.TransformerClass.samples), 1) - self.assertEqual(getattr(publisher.counters[0], "name"), + self.assertEqual(getattr(publisher.samples[0], "name"), 'a_update') def test_all_excluded_counters_not_excluded(self): @@ -310,9 +310,9 @@ class TestPipeline(base.TestCase): p([self.test_counter]) publisher = pipeline_manager.pipelines[0].publishers[0] - self.assertEqual(len(publisher.counters), 1) + self.assertEqual(len(publisher.samples), 1) self.assertTrue(len(self.TransformerClass.samples) == 1) - self.assertEqual(getattr(publisher.counters[0], "name"), 'a_update') + self.assertEqual(getattr(publisher.samples[0], "name"), 'a_update') self.assertTrue(getattr(self.TransformerClass.samples[0], "name") == 'a') @@ -361,13 +361,13 @@ class TestPipeline(base.TestCase): p([self.test_counter]) publisher = pipeline_manager.pipelines[0].publishers[0] - self.assertEqual(len(publisher.counters), 1) + self.assertEqual(len(publisher.samples), 1) self.assertEqual(publisher.calls, 1) - self.assertEqual(getattr(publisher.counters[0], "name"), 'a_update') + self.assertEqual(getattr(publisher.samples[0], "name"), 'a_update') new_publisher = pipeline_manager.pipelines[1].publishers[0] - self.assertEqual(len(new_publisher.counters), 1) + self.assertEqual(len(new_publisher.samples), 1) self.assertEqual(new_publisher.calls, 1) - self.assertEqual(getattr(new_publisher.counters[0], "name"), 'b_new') + self.assertEqual(getattr(new_publisher.samples[0], "name"), 'b_new') self.assertTrue(getattr(self.TransformerClass.samples[0], "name") == 'a') @@ -414,8 +414,8 @@ class TestPipeline(base.TestCase): publisher = pipeline_manager.pipelines[0].publishers[0] self.assertEqual(publisher.calls, 1) - self.assertEqual(len(publisher.counters), 1) - self.assertEqual(getattr(publisher.counters[0], "name"), 'a_update') + self.assertEqual(len(publisher.samples), 1) + self.assertEqual(getattr(publisher.samples[0], "name"), 'a_update') self.assertTrue(len(self.TransformerClass.samples) == 2) self.assertTrue(getattr(self.TransformerClass.samples[0], "name") == 'a') @@ -429,9 +429,9 @@ class TestPipeline(base.TestCase): with pipeline_manager.publisher(None) as p: p([self.test_counter]) publisher = pipeline_manager.pipelines[0].publishers[0] - self.assertEqual(len(publisher.counters), 1) + self.assertEqual(len(publisher.samples), 1) self.assertEqual(publisher.calls, 1) - self.assertEqual(getattr(publisher.counters[0], 'name'), 'a') + self.assertEqual(getattr(publisher.samples[0], 'name'), 'a') def test_empty_transformer_pipeline(self): self.pipeline_cfg[0]['transformers'] = [] @@ -440,9 +440,9 @@ class TestPipeline(base.TestCase): with pipeline_manager.publisher(None) as p: p([self.test_counter]) publisher = pipeline_manager.pipelines[0].publishers[0] - self.assertEqual(len(publisher.counters), 1) + self.assertEqual(len(publisher.samples), 1) self.assertEqual(publisher.calls, 1) - self.assertEqual(getattr(publisher.counters[0], 'name'), 'a') + self.assertEqual(getattr(publisher.samples[0], 'name'), 'a') def test_multiple_transformer_same_class(self): self.pipeline_cfg[0]['transformers'] = [ @@ -463,8 +463,8 @@ class TestPipeline(base.TestCase): publisher = pipeline_manager.pipelines[0].publishers[0] self.assertEqual(publisher.calls, 1) - self.assertEqual(len(publisher.counters), 1) - self.assertEqual(getattr(publisher.counters[0], 'name'), + self.assertEqual(len(publisher.samples), 1) + self.assertEqual(getattr(publisher.samples[0], 'name'), 'a_update_update') self.assertTrue(len(self.TransformerClass.samples) == 2) self.assertTrue(getattr(self.TransformerClass.samples[0], 'name') @@ -500,8 +500,8 @@ class TestPipeline(base.TestCase): self.assertTrue(getattr(self.TransformerClass.samples[1], 'name') == 'a_update') publisher = pipeline_manager.pipelines[0].publishers[0] - self.assertEqual(len(publisher.counters), 1) - self.assertEqual(getattr(publisher.counters[0], 'name'), + self.assertEqual(len(publisher.samples), 1) + self.assertEqual(getattr(publisher.samples[0], 'name'), 'a_update_new') def test_multiple_transformer_drop_transformer(self): @@ -531,7 +531,7 @@ class TestPipeline(base.TestCase): p([self.test_counter]) publisher = pipeline_manager.pipelines[0].publishers[0] - self.assertEqual(len(publisher.counters), 0) + self.assertEqual(len(publisher.samples), 0) self.assertTrue(len(self.TransformerClass.samples) == 1) self.assertTrue(getattr(self.TransformerClass.samples[0], 'name') == 'a') @@ -549,11 +549,11 @@ class TestPipeline(base.TestCase): publisher = pipeline_manager.pipelines[0].publishers[0] new_publisher = pipeline_manager.pipelines[0].publishers[1] - self.assertEqual(len(publisher.counters), 1) - self.assertEqual(len(new_publisher.counters), 1) - self.assertEqual(getattr(new_publisher.counters[0], 'name'), + self.assertEqual(len(publisher.samples), 1) + self.assertEqual(len(new_publisher.samples), 1) + self.assertEqual(getattr(new_publisher.samples[0], 'name'), 'a_update') - self.assertEqual(getattr(publisher.counters[0], 'name'), + self.assertEqual(getattr(publisher.samples[0], 'name'), 'a_update') def test_multiple_publisher_isolation(self): @@ -564,8 +564,8 @@ class TestPipeline(base.TestCase): p([self.test_counter]) new_publisher = pipeline_manager.pipelines[0].publishers[1] - self.assertEqual(len(new_publisher.counters), 1) - self.assertEqual(getattr(new_publisher.counters[0], 'name'), + self.assertEqual(len(new_publisher.samples), 1) + self.assertEqual(getattr(new_publisher.samples[0], 'name'), 'a_update') def test_multiple_counter_pipeline(self): @@ -587,9 +587,9 @@ class TestPipeline(base.TestCase): )]) publisher = pipeline_manager.pipelines[0].publishers[0] - self.assertEqual(len(publisher.counters), 2) - self.assertEqual(getattr(publisher.counters[0], 'name'), 'a_update') - self.assertEqual(getattr(publisher.counters[1], 'name'), 'b_update') + self.assertEqual(len(publisher.samples), 2) + self.assertEqual(getattr(publisher.samples[0], 'name'), 'a_update') + self.assertEqual(getattr(publisher.samples[1], 'name'), 'b_update') def test_flush_pipeline_cache(self): CACHE_SIZE = 10 @@ -614,17 +614,17 @@ class TestPipeline(base.TestCase): pipe.publish_sample(None, self.test_counter) publisher = pipeline_manager.pipelines[0].publishers[0] - self.assertEqual(len(publisher.counters), 0) + self.assertEqual(len(publisher.samples), 0) pipe.flush(None) - self.assertEqual(len(publisher.counters), 0) + self.assertEqual(len(publisher.samples), 0) pipe.publish_sample(None, self.test_counter) pipe.flush(None) - self.assertEqual(len(publisher.counters), 0) + self.assertEqual(len(publisher.samples), 0) for i in range(CACHE_SIZE - 2): pipe.publish_sample(None, self.test_counter) pipe.flush(None) - self.assertEqual(len(publisher.counters), CACHE_SIZE) - self.assertTrue(getattr(publisher.counters[0], 'name') + self.assertEqual(len(publisher.samples), CACHE_SIZE) + self.assertTrue(getattr(publisher.samples[0], 'name') == 'a_update_new') def test_flush_pipeline_cache_multiple_counter(self): @@ -662,15 +662,15 @@ class TestPipeline(base.TestCase): )]) publisher = pipeline_manager.pipelines[0].publishers[0] - self.assertEqual(len(publisher.counters), 0) + self.assertEqual(len(publisher.samples), 0) with pipeline_manager.publisher(None) as p: p([self.test_counter]) - self.assertEqual(len(publisher.counters), CACHE_SIZE) - self.assertEqual(getattr(publisher.counters[0], 'name'), + self.assertEqual(len(publisher.samples), CACHE_SIZE) + self.assertEqual(getattr(publisher.samples[0], 'name'), 'a_update_new') - self.assertEqual(getattr(publisher.counters[1], 'name'), + self.assertEqual(getattr(publisher.samples[1], 'name'), 'b_update_new') def test_flush_pipeline_cache_before_publisher(self): @@ -684,10 +684,10 @@ class TestPipeline(base.TestCase): publisher = pipe.publishers[0] pipe.publish_sample(None, self.test_counter) - self.assertEqual(len(publisher.counters), 0) + self.assertEqual(len(publisher.samples), 0) pipe.flush(None) - self.assertEqual(len(publisher.counters), 1) - self.assertEqual(getattr(publisher.counters[0], 'name'), + self.assertEqual(len(publisher.samples), 1) + self.assertEqual(getattr(publisher.samples[0], 'name'), 'a_update') def test_variable_counter(self): @@ -720,9 +720,9 @@ class TestPipeline(base.TestCase): p([self.test_counter]) publisher = pipeline_manager.pipelines[0].publishers[0] - self.assertEqual(len(publisher.counters), 1) + self.assertEqual(len(publisher.samples), 1) self.assertTrue(len(self.TransformerClass.samples) == 1) - self.assertEqual(getattr(publisher.counters[0], "name"), + self.assertEqual(getattr(publisher.samples[0], "name"), 'a:b_update') self.assertTrue(getattr(self.TransformerClass.samples[0], "name") == 'a:b') @@ -761,10 +761,10 @@ class TestPipeline(base.TestCase): pipe.publish_samples(None, counters) publisher = pipeline_manager.pipelines[0].publishers[0] - self.assertEqual(len(publisher.counters), 1) + self.assertEqual(len(publisher.samples), 1) pipe.flush(None) - self.assertEqual(len(publisher.counters), 1) - cpu_mins = publisher.counters[-1] + self.assertEqual(len(publisher.samples), 1) + cpu_mins = publisher.samples[-1] self.assertEqual(getattr(cpu_mins, 'name'), 'cpu_mins') self.assertEqual(getattr(cpu_mins, 'unit'), 'min') self.assertEqual(getattr(cpu_mins, 'type'), sample.TYPE_CUMULATIVE) @@ -814,12 +814,12 @@ class TestPipeline(base.TestCase): pipe.publish_samples(None, counters) publisher = pipeline_manager.pipelines[0].publishers[0] - self.assertEqual(len(publisher.counters), 2) - core_temp = publisher.counters[1] + self.assertEqual(len(publisher.samples), 2) + core_temp = publisher.samples[1] self.assertEqual(getattr(core_temp, 'name'), 'core_temperature') self.assertEqual(getattr(core_temp, 'unit'), '°F') self.assertEqual(getattr(core_temp, 'volume'), 96.8) - amb_temp = publisher.counters[0] + amb_temp = publisher.samples[0] self.assertEqual(getattr(amb_temp, 'name'), 'ambient_temperature') self.assertEqual(getattr(amb_temp, 'unit'), '°F') self.assertEqual(getattr(amb_temp, 'volume'), 88.8) @@ -903,16 +903,16 @@ class TestPipeline(base.TestCase): pipe.publish_samples(None, counters) publisher = pipeline_manager.pipelines[0].publishers[0] - self.assertEqual(len(publisher.counters), 2) + self.assertEqual(len(publisher.samples), 2) pipe.flush(None) - self.assertEqual(len(publisher.counters), 2) - cpu_util = publisher.counters[0] + self.assertEqual(len(publisher.samples), 2) + cpu_util = publisher.samples[0] self.assertEqual(getattr(cpu_util, 'name'), 'cpu_util') self.assertEqual(getattr(cpu_util, 'resource_id'), 'test_resource') self.assertEqual(getattr(cpu_util, 'unit'), '%') self.assertEqual(getattr(cpu_util, 'type'), sample.TYPE_GAUGE) self.assertEqual(getattr(cpu_util, 'volume'), expected) - cpu_util = publisher.counters[1] + cpu_util = publisher.samples[1] self.assertEqual(getattr(cpu_util, 'name'), 'cpu_util') self.assertEqual(getattr(cpu_util, 'resource_id'), 'test_resource2') self.assertEqual(getattr(cpu_util, 'unit'), '%') @@ -987,6 +987,6 @@ class TestPipeline(base.TestCase): pipe.publish_samples(None, counters) publisher = pipeline_manager.pipelines[0].publishers[0] - self.assertEqual(len(publisher.counters), 0) + self.assertEqual(len(publisher.samples), 0) pipe.flush(None) - self.assertEqual(len(publisher.counters), 0) + self.assertEqual(len(publisher.samples), 0)