dfcd0dd7c4
When using ImagePollster to poll image status from Glance, there might
be duplicate image status event recorded down if there are private
images together with public images stored in Glance.
In Glance, the get image list API looks like:
def _get_images(self, context, filters, **params):
...
# NOTE(markwash): for backwards compatibility, is_public=True for
# admins actually means "treat me as if I'm not an admin and show
# all my images"
if context.is_admin and params.get('is_public') is True:
context.is_admin = False
del params['is_public']
...
The above code shows that if a user is of 'admin_role'(this option is
configured in the glance-api.conf) and querying for public images,
Glance will return all the public images together with the private
ones
While in ceilometer/image/glance.py#_Base.iter_images method,
ceilometer get the image list by querying public and private images
respectively and then chain the result lists together. This causes
the duplication of image in the image list.
This fix changes the code in ImagePollster.get_counters method to
filter out the duplicate images based on their image id.
Change-Id: Ib5e213161043033c20195efc0c6e7edd78982bd6
Fixes: Bug 1180630
156 lines
5.3 KiB
Python
156 lines
5.3 KiB
Python
# -*- encoding: utf-8 -*-
|
|
#
|
|
# Copyright © 2012 New Dream Network, LLC (DreamHost)
|
|
#
|
|
# Author: Julien Danjou <julien@danjou.info>
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import mock
|
|
|
|
from ceilometer.tests import base
|
|
from ceilometer.image import glance
|
|
from ceilometer.central import manager
|
|
from ceilometer.openstack.common import context
|
|
|
|
|
|
IMAGE_LIST = [
|
|
type('Image', (object,),
|
|
{u'status': u'queued',
|
|
u'name': "some name",
|
|
u'deleted': False,
|
|
u'container_format': None,
|
|
u'created_at': u'2012-09-18T16:29:46',
|
|
u'disk_format': None,
|
|
u'updated_at': u'2012-09-18T16:29:46',
|
|
u'properties': {},
|
|
u'min_disk': 0,
|
|
u'protected': False,
|
|
u'id': u'1d21a8d0-25f4-4e0a-b4ec-85f40237676b',
|
|
u'location': None,
|
|
u'checksum': None,
|
|
u'owner': u'4c8364fc20184ed7971b76602aa96184',
|
|
u'is_public': True,
|
|
u'deleted_at': None,
|
|
u'min_ram': 0,
|
|
u'size': 2048}),
|
|
type('Image', (object,),
|
|
{u'status': u'active',
|
|
u'name': "hello world",
|
|
u'deleted': False,
|
|
u'container_format': None,
|
|
u'created_at': u'2012-09-18T16:27:41',
|
|
u'disk_format': None,
|
|
u'updated_at': u'2012-09-18T16:27:41',
|
|
u'properties': {},
|
|
u'min_disk': 0,
|
|
u'protected': False,
|
|
u'id': u'22be9f90-864d-494c-aa74-8035fd535989',
|
|
u'location': None,
|
|
u'checksum': None,
|
|
u'owner': u'9e4f98287a0246daa42eaf4025db99d4',
|
|
u'is_public': True,
|
|
u'deleted_at': None,
|
|
u'min_ram': 0,
|
|
u'size': 0}),
|
|
type('Image', (object,),
|
|
{u'status': u'queued',
|
|
u'name': None,
|
|
u'deleted': False,
|
|
u'container_format': None,
|
|
u'created_at': u'2012-09-18T16:23:27',
|
|
u'disk_format': "raw",
|
|
u'updated_at': u'2012-09-18T16:23:27',
|
|
u'properties': {},
|
|
u'min_disk': 0,
|
|
u'protected': False,
|
|
u'id': u'8d133f6c-38a8-403c-b02c-7071b69b432d',
|
|
u'location': None,
|
|
u'checksum': None,
|
|
u'owner': u'5f8806a76aa34ee8b8fc8397bd154319',
|
|
u'is_public': True,
|
|
u'deleted_at': None,
|
|
u'min_ram': 0,
|
|
u'size': 1024}),
|
|
# Make one duplicate private image to test the iter_images method.
|
|
type('Image', (object,),
|
|
{u'status': u'queued',
|
|
u'name': "some name",
|
|
u'deleted': False,
|
|
u'container_format': None,
|
|
u'created_at': u'2012-09-18T16:29:46',
|
|
u'disk_format': None,
|
|
u'updated_at': u'2012-09-18T16:29:46',
|
|
u'properties': {},
|
|
u'min_disk': 0,
|
|
u'protected': False,
|
|
u'id': u'1d21a8d0-25f4-4e0a-b4ec-85f40237676b',
|
|
u'location': None,
|
|
u'checksum': None,
|
|
u'owner': u'4c8364fc20184ed7971b76602aa96184',
|
|
u'is_public': True,
|
|
u'deleted_at': None,
|
|
u'min_ram': 0,
|
|
u'size': 2048}),
|
|
]
|
|
|
|
|
|
class _BaseObject(object):
|
|
pass
|
|
|
|
|
|
class TestManager(manager.AgentManager):
|
|
|
|
def __init__(self):
|
|
super(TestManager, self).__init__()
|
|
self.keystone = None
|
|
|
|
|
|
class TestImagePollster(base.TestCase):
|
|
|
|
def fake_get_glance_client(self, ksclient):
|
|
glanceclient = _BaseObject()
|
|
setattr(glanceclient, "images", _BaseObject())
|
|
setattr(glanceclient.images,
|
|
"list", lambda *args, **kwargs: iter(IMAGE_LIST))
|
|
return glanceclient
|
|
|
|
@mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock())
|
|
def setUp(self):
|
|
super(TestImagePollster, self).setUp()
|
|
self.context = context.get_admin_context()
|
|
self.manager = TestManager()
|
|
self.stubs.Set(glance._Base, 'get_glance_client',
|
|
self.fake_get_glance_client)
|
|
|
|
# Tests whether the iter_images method returns an unique image list.
|
|
def test_iter_images(self):
|
|
images = list(glance.ImagePollster().
|
|
iter_images(self.manager.keystone))
|
|
self.assertEqual(len(images), len(set(image.id for image in images)))
|
|
|
|
def test_glance_image_counter(self):
|
|
counters = list(glance.ImagePollster().get_counters(self.manager))
|
|
self.assertEqual(len(counters), 6)
|
|
for counter in [c for c in counters if c.name == 'image']:
|
|
self.assertEqual(counter.volume, 1)
|
|
for image in IMAGE_LIST:
|
|
self.assert_(
|
|
any(map(lambda counter: counter.volume == image.size,
|
|
counters)))
|
|
|
|
def test_get_counter_names(self):
|
|
counters = list(glance.ImagePollster().get_counters(self.manager))
|
|
self.assertEqual(set([c.name for c in counters]),
|
|
set(glance.ImagePollster().get_counter_names()))
|