openstack/aodh
Code Issues Proposed changes

Factorize agent code

Browse Source 
There was some code duplication between the central and compute agent around
their managers, so let's factorize that.

Change-Id: I90514e7591833254145ceab366ad5a0d03d8f228
Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2013-01-21 12:25:43 +01:00
parent 09c8251e5f
commit 426540ecc8
4 changed files with 65 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
ceilometer/agent.py Normal file
View File

@ -0,0 +1,47 @@
# -*- encoding: utf-8 -*-
#
# Copyright © 2013 Julien Danjou
#
# 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 ceilometer import publish
from ceilometer.openstack.common import cfg
from ceilometer.openstack.common import log
LOG = log.getLogger(__name__)
class AgentManager(object):
def __init__(self, extension_manager):
self.ext_manager = extension_manager
def publish_counters_from_one_pollster(self, ext, manager, context,
*args, **kwargs):
"""Used to invoke the plugins loaded by the ExtensionManager.
"""
try:
LOG.info('Polling %s', ext.name)
for c in ext.obj.get_counters(manager, *args, **kwargs):
LOG.debug('Publishing counter: %s', c)
publish.publish_counter(context, c,
cfg.CONF.metering_topic,
cfg.CONF.metering_secret,
cfg.CONF.counter_source,
)
except Exception as err:
LOG.warning('Continuing after error from %s: %s',
ext.name, err)
LOG.exception(err)

42
ceilometer/central/manager.py
View File

@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
#
# Copyright © 2012 eNovance <licensing@enovance.com>
# Copyright © 2012-2013 eNovance <licensing@enovance.com>
#
# Author: Julien Danjou <julien@danjou.info>
#
@ -16,10 +16,9 @@
# License for the specific language governing permissions and limitations
# under the License.
from ceilometer import agent
from ceilometer import extension_manager
from ceilometer.openstack.common import cfg
from ceilometer.openstack.common import log
from ceilometer import publish
OPTS = [
cfg.ListOpt('disabled_central_pollsters',
@ -30,43 +29,20 @@ OPTS = [
cfg.CONF.register_opts(OPTS)
LOG = log.getLogger(__name__)
PLUGIN_NAMESPACE = 'ceilometer.poll.central'
class AgentManager(agent.AgentManager):
class AgentManager(object):
def __init__(self, host=None):
super(AgentManager, self).__init__()
self.host = host
self.ext_manager = extension_manager.ActivatedExtensionManager(
namespace=PLUGIN_NAMESPACE,
disabled_names=cfg.CONF.disabled_central_pollsters,
def __init__(self):
super(AgentManager, self).__init__(
extension_manager.ActivatedExtensionManager(
namespace='ceilometer.poll.central',
disabled_names=cfg.CONF.disabled_central_pollsters,
),
)
@staticmethod
def publish_counters_from_one_pollster(ext, manager, context):
"""Used to invoke the plugins loaded by the ExtensionManager.
"""
try:
LOG.info('polling %s', ext.name)
for c in ext.obj.get_counters(manager, context):
LOG.info('COUNTER: %s', c)
publish.publish_counter(context=context,
counter=c,
topic=cfg.CONF.metering_topic,
secret=cfg.CONF.metering_secret,
source=cfg.CONF.counter_source,
)
except Exception as err:
LOG.warning('Continuing after error from %s: %s',
ext.name, err)
LOG.exception(err)
def periodic_tasks(self, context, raise_on_error=False):
"""Tasks to be run at a periodic interval."""
self.ext_manager.map(self.publish_counters_from_one_pollster,
manager=self,
context=context,
)
return

39
ceilometer/compute/manager.py
View File

@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
#
# Copyright © 2012 eNovance <licensing@enovance.com>
# Copyright © 2012-2013 eNovance <licensing@enovance.com>
#
# Author: Julien Danjou <julien@danjou.info>
#
@ -18,13 +18,12 @@
from stevedore import driver
from ceilometer import agent
from ceilometer import extension_manager
from ceilometer import nova_client
from ceilometer.compute.virt import inspector as virt_inspector
from ceilometer.openstack.common import cfg
from ceilometer.openstack.common import log
from ceilometer import publish
OPTS = [
cfg.ListOpt('disabled_compute_pollsters',
@ -41,8 +40,6 @@ cfg.CONF.register_opts(OPTS)
LOG = log.getLogger(__name__)
PLUGIN_NAMESPACE = 'ceilometer.poll.compute'
def get_hypervisor_inspector():
try:
@ -56,41 +53,23 @@ def get_hypervisor_inspector():
return virt_inspector.Inspector()
class AgentManager(object):
class AgentManager(agent.AgentManager):
def __init__(self):
self.ext_manager = extension_manager.ActivatedExtensionManager(
namespace=PLUGIN_NAMESPACE,
disabled_names=cfg.CONF.disabled_compute_pollsters,
super(AgentManager, self).__init__(
extension_manager.ActivatedExtensionManager(
namespace='ceilometer.poll.compute',
disabled_names=cfg.CONF.disabled_compute_pollsters,
),
)
self._inspector = get_hypervisor_inspector()
return
@staticmethod
def publish_counters_from_one_pollster(ext, manager, context, instance):
"""Used to invoke the plugins loaded by the ExtensionManager.
"""
try:
LOG.info('polling %s', ext.name)
for c in ext.obj.get_counters(manager, instance):
LOG.info('COUNTER: %s', c)
publish.publish_counter(context, c,
cfg.CONF.metering_topic,
cfg.CONF.metering_secret,
cfg.CONF.counter_source,
)
except Exception as err:
LOG.warning('Continuing after error from %s for %s: %s',
ext.name, instance.id, err)
LOG.exception(err)
def poll_instance(self, context, instance):
"""Poll one instance."""
self.ext_manager.map(self.publish_counters_from_one_pollster,
manager=self,
context=context,
instance=instance,
)
instance=instance)
def periodic_tasks(self, context, raise_on_error=False):
"""Tasks to be run at a periodic interval."""

1
tests/network/test_floatingip.py
View File

@ -41,7 +41,6 @@ class TestFloatingIPPollster(base.TestCase):
for i in range(1, 4):
ip = mock.MagicMock()
ip.address = '1.1.1.%d' % i
ip.host = self.manager.host
ips.append(ip)
return ips