Use glance public API as opposed to registry API.

Fixes bug 1064008

The motivation for switching over to the public API:

 - the registry API is more of an artifact of the internal glance
   architecture than a true public API

 - the registry API exposes internal attributes such as the backend
   store image location, which is stripped from the API-provided image
   representation for security reasons (hence should not bleed into
   metering)

 - the internalURL should be available from the keystone service catalog,
   so we can get rid of the registry host/port config

Change-Id: I0d75392066a020c608a67f1ecf0e8dba15aa48f0

ceilometer/image/glance.py

@@ -22,49 +22,45 @@ from __future__ import absolute_import
 
 import itertools
 
+import glanceclient
 from keystoneclient.v2_0 import client as ksclient
-from glance.registry import client
 
 from ceilometer import plugin
 from ceilometer import counter
 from ceilometer.openstack.common import cfg
 from ceilometer.openstack.common import timeutils
 
-cfg.CONF.register_opts(
-    [
-        cfg.StrOpt('glance_registry_host',
-                   default='localhost',
-                   help="URL of Glance API server"),
-        cfg.IntOpt('glance_registry_port',
-                   default=9191,
-                   help="URL of Glance API server"),
-    ])
-
 
 class _Base(plugin.PollsterBase):
 
     @staticmethod
-    def get_registry_client():
+    def get_glance_client():
         k = ksclient.Client(username=cfg.CONF.os_username,
                             password=cfg.CONF.os_password,
                             tenant_id=cfg.CONF.os_tenant_id,
                             tenant_name=cfg.CONF.os_tenant_name,
                             auth_url=cfg.CONF.os_auth_url)
-        return client.RegistryClient(cfg.CONF.glance_registry_host,
+
-                                     cfg.CONF.glance_registry_port,
+        endpoint = k.service_catalog.url_for(service_type='image',
-                                     auth_tok=k.auth_token)
+                                             endpoint_type='internalURL')
+
+        # hard-code v1 glance API version selection while v2 API matures
+        return glanceclient.Client('1', endpoint, token=k.auth_token)
 
     def iter_images(self):
         """Iterate over all images."""
-        # We need to ask for both public and non public to get all images.
+        client = self.get_glance_client()
-        client = self.get_registry_client()
+        #TODO(eglynn): use pagination to protect against unbounded
+        #              memory usage
         return itertools.chain(
-            client.get_images_detailed(filters={"is_public": True}),
+            client.images.list(filters={"is_public": True}),
-            client.get_images_detailed(filters={"is_public": False}))
+            #TODO(eglynn): extend glance API with all_tenants logic to
+            #              avoid second call to retrieve private images
+            client.images.list(filters={"is_public": False}))
 
     @staticmethod
     def extract_image_metadata(image):
-        return dict([(k, image[k])
+        return dict((k, getattr(image, k))
                      for k in [
                              "status",
                              "is_public",
@@ -77,13 +73,12 @@ class _Base(plugin.PollsterBase):
                              "properties",
                              "min_disk",
                              "protected",
-                             "location",
                              "checksum",
                              "deleted_at",
                              "min_ram",
                              "size",
                      ]
-                 ])
+                 )
 
 
 class ImagePollster(_Base):
@@ -96,8 +91,8 @@ class ImagePollster(_Base):
                 type=counter.TYPE_GAUGE,
                 volume=1,
                 user_id=None,
-                project_id=image['owner'],
+                project_id=image.owner,
-                resource_id=image['id'],
+                resource_id=image.id,
                 timestamp=timeutils.isotime(),
                 resource_metadata=self.extract_image_metadata(image),
             )
@@ -111,10 +106,10 @@ class ImageSizePollster(_Base):
                 source='?',
                 name='image.size',
                 type=counter.TYPE_GAUGE,
-                volume=image['size'],
+                volume=image.size,
                 user_id=None,
-                project_id=image['owner'],
+                project_id=image.owner,
-                resource_id=image['id'],
+                resource_id=image.id,
                 timestamp=timeutils.isotime(),
                 resource_metadata=self.extract_image_metadata(image),
             )

doc/source/configuration.rst

@@ -32,8 +32,6 @@ Parameter                   Default                               Note
 ==========================  ====================================  ==============================================================
 nova_control_exchange       nova                                  Exchange name for Nova notifications
 glance_control_exchange     glance_notifications                  Exchange name for Glance notifications
-glance_registry_host        localhost                             URL of Glance API server
-glance_registry_port        9191                                  port of Glance API server
 cinder_control_exchange     cinder                                Exchange name for Cinder notifications
 quantum_control_exchange    quantum                               Exchange name for Quantum notifications
 metering_secret             change this or be hacked              Secret value for signing metering messages

tests/image/test_glance.py

@@ -23,6 +23,7 @@ from ceilometer.openstack.common import context
 
 
 IMAGE_LIST = [
+    type('Image', (object,),
          {u'status': u'queued',
           u'name': "some name",
           u'deleted': False,
@@ -40,7 +41,8 @@ IMAGE_LIST = [
           u'is_public': True,
           u'deleted_at': None,
           u'min_ram': 0,
-     u'size': 2048},
+          u'size': 2048}),
+    type('Image', (object,),
          {u'status': u'active',
           u'name': "hello world",
           u'deleted': False,
@@ -58,7 +60,8 @@ IMAGE_LIST = [
           u'is_public': True,
           u'deleted_at': None,
           u'min_ram': 0,
-     u'size': 0},
+          u'size': 0}),
+    type('Image', (object,),
          {u'status': u'queued',
           u'name': None,
           u'deleted': False,
@@ -76,7 +79,7 @@ IMAGE_LIST = [
           u'is_public': True,
           u'deleted_at': None,
           u'min_ram': 0,
-     u'size': 1024},
+          u'size': 1024}),
 ]
 
 
@@ -106,5 +109,5 @@ class TestImagePollster(base.TestCase):
         self.assertEqual(len(counters), 3)
         for image in IMAGE_LIST:
             self.assert_(
-                any(map(lambda counter: counter.volume == image['size'],
+                any(map(lambda counter: counter.volume == image.size,
                                  counters)))