
The global config object inside the ceilometer copy of openstack.common.cfg was not being configured, which meant the RPC code in openstack.common.rpc was not set up. That lead to an infinite loop when the notifier was invoked, since it tried to connect to the message bus over and over and over. This change forces the configuration object to be loaded from the ceilometer agent configuration file, assumed to be in /etc/ceilometer/ceilometer-agent.conf. It also changes the notifier to do that initialization the first time it is used, rather than when the module is imported. This prevents the tests from loading the module and initializing the config object, causing exceptions in any subsequent code that tries to add new configuration options. Also folded into this changeset is a fix to use the right db method to load the instance. Notification messages contain the UUID of the object, not the numerical key from the id column of the table. Therefore, we need to use db.instance_get_by_uuid() instead of db.instance_get(). Change-Id: I45719ab879ae6163329b6a886dee3e82ed4bc260 Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
143 lines
5.5 KiB
Python
143 lines
5.5 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.
|
|
"""Tests for ceilometer.compute.nova_notifier
|
|
"""
|
|
|
|
import mock
|
|
import datetime
|
|
|
|
from nova import flags
|
|
from nova import db
|
|
from nova import context
|
|
from nova.tests import fake_network
|
|
from nova.compute import vm_states
|
|
# Needed for flags option, but Essex does not have it
|
|
try:
|
|
from nova.openstack.common.notifier import api as notifier_api
|
|
except ImportError:
|
|
notifier_api = None
|
|
|
|
|
|
from ceilometer import publish
|
|
from ceilometer import counter
|
|
from ceilometer.tests import base
|
|
from ceilometer.tests import skip
|
|
from ceilometer.compute import nova_notifier
|
|
from ceilometer.openstack.common import cfg
|
|
from ceilometer.openstack.common import importutils
|
|
|
|
|
|
class TestNovaNotifier(base.TestCase):
|
|
|
|
class Pollster(object):
|
|
counters = []
|
|
test_data = counter.Counter(
|
|
source='test',
|
|
name='test',
|
|
type=counter.TYPE_CUMULATIVE,
|
|
volume=1,
|
|
user_id='test',
|
|
project_id='test',
|
|
resource_id='test_run_tasks',
|
|
timestamp=datetime.datetime.utcnow().isoformat(),
|
|
resource_metadata={'name': 'Pollster',
|
|
},
|
|
)
|
|
|
|
def get_counters(self, manager, instance):
|
|
self.counters.append((manager, instance))
|
|
return [self.test_data]
|
|
|
|
def fake_db_instance_get(self, context, id_):
|
|
if self.instance['uuid'] == id_:
|
|
return mock.MagicMock(name=self.instance['name'],
|
|
id=self.instance['uuid'])
|
|
|
|
@staticmethod
|
|
def do_nothing(*args, **kwargs):
|
|
pass
|
|
|
|
@staticmethod
|
|
def fake_db_instance_system_metadata_get(context, uuid):
|
|
return dict(meta_a=123, meta_b="foobar")
|
|
|
|
@skip.skip_unless(notifier_api, "Notifier API not found")
|
|
def setUp(self):
|
|
super(TestNovaNotifier, self).setUp()
|
|
flags.FLAGS.compute_driver = 'nova.virt.fake.FakeDriver'
|
|
flags.FLAGS.notification_driver = [nova_notifier.__name__]
|
|
self.compute = importutils.import_object(flags.FLAGS.compute_manager)
|
|
self.context = context.RequestContext('admin', 'admin', is_admin=True)
|
|
fake_network.set_stub_network_methods(self.stubs)
|
|
|
|
self.instance = {"name": "instance-1",
|
|
"id": 1,
|
|
"image_ref": "FAKE",
|
|
"user_id": "FAKE",
|
|
"project_id": "FAKE",
|
|
"display_name": "FAKE NAME",
|
|
"reservation_id": "FAKE RID",
|
|
"instance_type_id": 1,
|
|
"architecture": "x86",
|
|
"memory_mb": "1024",
|
|
"root_gb": "20",
|
|
"ephemeral_gb": "0",
|
|
"vcpus": 1,
|
|
"host": "fakehost",
|
|
"availability_zone":
|
|
"1e3ce043029547f1a61c1996d1a531a4",
|
|
"created_at": '2012-05-08 20:23:41',
|
|
"os_type": "linux",
|
|
"kernel_id": "kernelid",
|
|
"ramdisk_id": "ramdiskid",
|
|
"vm_state": vm_states.ACTIVE,
|
|
"access_ip_v4": "someip",
|
|
"access_ip_v6": "someip",
|
|
"metadata": {},
|
|
"uuid": "144e08f4-00cb-11e2-888e-5453ed1bbb5f"}
|
|
|
|
self.stubs.Set(db, 'instance_get_by_uuid', self.fake_db_instance_get)
|
|
self.stubs.Set(db, 'instance_info_cache_delete', self.do_nothing)
|
|
self.stubs.Set(db, 'instance_destroy', self.do_nothing)
|
|
self.stubs.Set(db, 'instance_system_metadata_get',
|
|
self.fake_db_instance_system_metadata_get)
|
|
self.stubs.Set(db, 'block_device_mapping_get_all_by_instance',
|
|
lambda context, instance: {})
|
|
self.stubs.Set(db, 'instance_update_and_get_original',
|
|
lambda context, uuid, kwargs: (self.instance,
|
|
self.instance))
|
|
|
|
self.stubs.Set(publish, 'publish_counter', self.do_nothing)
|
|
nova_notifier._initialize_config_options = False
|
|
nova_notifier.initialize_manager()
|
|
nova_notifier._agent_manager.pollsters = [('test', self.Pollster())]
|
|
|
|
def tearDown(self):
|
|
self.Pollster.counters = []
|
|
super(TestNovaNotifier, self).tearDown()
|
|
|
|
def test_notifications(self):
|
|
self.compute.terminate_instance(self.context, instance=self.instance)
|
|
self.assertTrue(self.Pollster.counters)
|
|
self.assertTrue(self.Pollster.counters[0])
|
|
self.assertEqual(self.Pollster.counters[0][0],
|
|
nova_notifier._agent_manager)
|
|
self.assertEqual(self.Pollster.counters[0][1].id,
|
|
self.instance['uuid'])
|
|
self.assertEqual(len(self.Pollster.counters), 1)
|