openstack/aodh
Code Issues Proposed changes

Merge "remove useless looping in pipeline"

Browse Source
This commit is contained in:
Jenkins 2014-12-12 13:27:16 +00:00 committed by Gerrit Code Review
commit fec091a2db
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ceilometer/pipeline.py
View File

@ -18,8 +18,6 @@
# under the License. # under the License.
import fnmatch import fnmatch
import itertools
import operator
import os import os
from oslo.config import cfg from oslo.config import cfg
@ -312,9 +310,6 @@ class Sink(object):
'pub': p})) 'pub': p}))
def publish_samples(self, ctxt, samples): def publish_samples(self, ctxt, samples):
for meter_name, samples in itertools.groupby(
sorted(samples, key=operator.attrgetter('name')),
operator.attrgetter('name')):
self._publish_samples(0, ctxt, samples) self._publish_samples(0, ctxt, samples)
def flush(self, ctxt): def flush(self, ctxt):

4
ceilometer/tests/pipeline_base.py
View File

@ -869,11 +869,11 @@ class BasePipelineTestCase(base.BaseTestCase):
pipe.publish_samples(None, counters) pipe.publish_samples(None, counters)
publisher = pipeline_manager.pipelines[0].publishers[0] publisher = pipeline_manager.pipelines[0].publishers[0]
self.assertEqual(2, len(publisher.samples)) self.assertEqual(2, len(publisher.samples))
core_temp = publisher.samples[1] core_temp = publisher.samples[0]
self.assertEqual('core_temperature', getattr(core_temp, 'name')) self.assertEqual('core_temperature', getattr(core_temp, 'name'))
self.assertEqual('°F', getattr(core_temp, 'unit')) self.assertEqual('°F', getattr(core_temp, 'unit'))
self.assertEqual(96.8, getattr(core_temp, 'volume')) self.assertEqual(96.8, getattr(core_temp, 'volume'))
amb_temp = publisher.samples[0] amb_temp = publisher.samples[1]
self.assertEqual('ambient_temperature', getattr(amb_temp, 'name')) self.assertEqual('ambient_temperature', getattr(amb_temp, 'name'))
self.assertEqual('°F', getattr(amb_temp, 'unit')) self.assertEqual('°F', getattr(amb_temp, 'unit'))
self.assertEqual(88.8, getattr(amb_temp, 'volume')) self.assertEqual(88.8, getattr(amb_temp, 'volume'))