Add nova_notifier notification driver for nova
This adds a new notification driver to be used by nova in order to intercept instance deletion message before the instance is deleted. With this, we are able to poll an instance about to be deleted before it disappers and therefore not miss any meter. This fixes bug #1005944 Change-Id: Ie039681e8e440cb9be2f30e3d72d9a2bc4ddf5ba Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou
parent
16b9f9006a
commit
8229941dcf
37
ceilometer/compute/nova_notifier.py
Normal file
37
ceilometer/compute/nova_notifier.py
Normal file
@ -0,0 +1,37 @@
|
||||
# -*- 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.
|
||||
|
||||
from nova import db
|
||||
from ceilometer.compute.manager import AgentManager
|
||||
|
||||
|
||||
class CeilometerNovaNotifier(object):
|
||||
"""Special notifier for Nova, doing special jobs for Ceilometer."""
|
||||
|
||||
def __init__(self):
|
||||
self.manager = AgentManager()
|
||||
self.manager.init_host()
|
||||
|
||||
def __call__(self, context, message):
|
||||
if message['event_type'] == 'compute.instance.delete.start':
|
||||
instance_id = message['payload']['instance_id']
|
||||
self.manager.poll_instance(context,
|
||||
db.instance_get(context,
|
||||
instance_id))
|
||||
|
||||
notify = CeilometerNovaNotifier()
|
||||
@ -53,7 +53,7 @@ ceilometer::
|
||||
|
||||
# Configure the notifier to talk to the message queue
|
||||
# and turn on usage audit events
|
||||
EXTRA_OPTS=(notification_driver=nova.openstack.common.notifier.rabbit_notifier)
|
||||
EXTRA_OPTS=(notification_driver=nova.openstack.common.notifier.rabbit_notifier,ceilometer.compute.nova_notifier)
|
||||
|
||||
# Enable the ceilometer services
|
||||
enable_service ceilometer-acompute,ceilometer-acentral,ceilometer-collector
|
||||
|
||||
134
tests/compute/test_nova_notifier.py
Normal file
134
tests/compute/test_nova_notifier.py
Normal file
@ -0,0 +1,134 @@
|
||||
# -*- 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 importutils
|
||||
|
||||
|
||||
class TestNovaNotifier(base.TestCase):
|
||||
|
||||
class Pollster(object):
|
||||
counters = []
|
||||
test_data = counter.Counter(
|
||||
source='test',
|
||||
name='test',
|
||||
type='cumulative',
|
||||
volume=1,
|
||||
user_id='test',
|
||||
project_id='test',
|
||||
resource_id='test_run_tasks',
|
||||
timestamp=datetime.datetime.utcnow().isoformat(),
|
||||
duration=0,
|
||||
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', 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(self.compute.resource_tracker, 'free_resources', self.do_nothing)
|
||||
|
||||
self.stubs.Set(publish, 'publish_counter', self.do_nothing)
|
||||
nova_notifier.notify.manager.pollsters = [('test', self.Pollster())]
|
||||
|
||||
def tearDown(self):
|
||||
super(TestNovaNotifier, self).tearDown()
|
||||
self.Pollster.counters = []
|
||||
|
||||
def test_notifications(self):
|
||||
self.compute.terminate_instance(self.context, instance=self.instance)
|
||||
self.assertEqual(self.Pollster.counters[0][0], nova_notifier.notify.manager)
|
||||
self.assertEqual(self.Pollster.counters[0][1].id, self.instance['uuid'])
|
||||
self.assertEqual(len(self.Pollster.counters), 1)
|
||||
Loading…
Reference in New Issue
Block a user