Merge "Remove the ImageSizePollster"

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,

setup.py

@@ -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
     kwapi = ceilometer.energy.kwapi:KwapiPollster
 

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,