openstack/deb-ceilometer
Code Issues Proposed changes

Merge "Remove the ImageSizePollster"

Browse Source
This commit is contained in:
Jenkins 2013-01-18 13:24:44 +00:00 committed by Gerrit Code Review
commit b09255cb6b
3 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ceilometer/image/glance.py
View File

@ -96,12 +96,6 @@ class ImagePollster(_Base):
timestamp=timeutils.isotime(), timestamp=timeutils.isotime(),
resource_metadata=self.extract_image_metadata(image), resource_metadata=self.extract_image_metadata(image),
) )
class ImageSizePollster(_Base):
def get_counters(self, manager, context):
for image in self.iter_images():
yield counter.Counter( yield counter.Counter(
name='image.size', name='image.size',
type=counter.TYPE_GAUGE, type=counter.TYPE_GAUGE,

1
setup.py
View File

@ -119,7 +119,6 @@ setuptools.setup(
[ceilometer.poll.central] [ceilometer.poll.central]
network_floatingip = ceilometer.network.floatingip:FloatingIPPollster network_floatingip = ceilometer.network.floatingip:FloatingIPPollster
image = ceilometer.image.glance:ImagePollster image = ceilometer.image.glance:ImagePollster
image_size = ceilometer.image.glance:ImageSizePollster
objectstore = ceilometer.objectstore.swift:SwiftPollster objectstore = ceilometer.objectstore.swift:SwiftPollster
kwapi = ceilometer.energy.kwapi:KwapiPollster kwapi = ceilometer.energy.kwapi:KwapiPollster

9
tests/image/test_glance.py
View File

@ -99,14 +99,9 @@ class TestImagePollster(base.TestCase):
def test_glance_image_counter(self): def test_glance_image_counter(self):
counters = list(glance.ImagePollster().get_counters(self.manager, counters = list(glance.ImagePollster().get_counters(self.manager,
self.context)) self.context))
self.assertEqual(len(counters), 3) self.assertEqual(len(counters), 6)
for counter in counters: for counter in [c for c in counters if c.name == 'image']:
self.assertEqual(counter.volume, 1) self.assertEqual(counter.volume, 1)
def test_glance_image_size_counter(self):
counters = list(glance.ImageSizePollster().get_counters(self.manager,
self.context))
self.assertEqual(len(counters), 3)
for image in IMAGE_LIST: for image in IMAGE_LIST:
self.assert_( self.assert_(
any(map(lambda counter: counter.volume == image.size, any(map(lambda counter: counter.volume == image.size,