diff options
author | Yunhong, Jiang <yunhong.jiang@intel.com> | 2013-01-16 22:44:46 +0800 |
---|---|---|
committer | Yunhong, Jiang <yunhong.jiang@intel.com> | 2013-01-16 22:46:55 +0800 |
commit | a801bdfb170e338133cf7faaaa97f0b7dcc0abc7 (patch) | |
tree | 52fff14f7c018ac01adeb5edaacd76663db27c0c | |
parent | 51c8a8e55cc43ef5774c42ce38c962cb2526acfb (diff) | |
download | ceilometer-a801bdfb170e338133cf7faaaa97f0b7dcc0abc7.tar.gz |
Remove the ImageSizePollster
We can use generator to achieve this purpose simply.
Change-Id: Id05c33fb2aa89fd02035c717417d0181e975c3ec
Signed-off-by: Yunhong, Jiang <yunhong.jiang@intel.com>
-rw-r--r-- | ceilometer/image/glance.py | 6 | ||||
-rwxr-xr-x | setup.py | 1 | ||||
-rw-r--r-- | tests/image/test_glance.py | 9 |
3 files changed, 2 insertions, 14 deletions
diff --git a/ceilometer/image/glance.py b/ceilometer/image/glance.py index 743d6598..06a9d420 100644 --- a/ceilometer/image/glance.py +++ b/ceilometer/image/glance.py @@ -96,12 +96,6 @@ class ImagePollster(_Base): timestamp=timeutils.isotime(), 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( name='image.size', type=counter.TYPE_GAUGE, @@ -119,7 +119,6 @@ setuptools.setup( [ceilometer.poll.central] network_floatingip = ceilometer.network.floatingip:FloatingIPPollster image = ceilometer.image.glance:ImagePollster - image_size = ceilometer.image.glance:ImageSizePollster objectstore = ceilometer.objectstore.swift:SwiftPollster [ceilometer.storage] diff --git a/tests/image/test_glance.py b/tests/image/test_glance.py index 704ac241..e221e6bf 100644 --- a/tests/image/test_glance.py +++ b/tests/image/test_glance.py @@ -99,14 +99,9 @@ class TestImagePollster(base.TestCase): def test_glance_image_counter(self): counters = list(glance.ImagePollster().get_counters(self.manager, self.context)) - self.assertEqual(len(counters), 3) - for counter in counters: + self.assertEqual(len(counters), 6) + for counter in [c for c in counters if c.name == 'image']: 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: self.assert_( any(map(lambda counter: counter.volume == image.size, |