openstack/aodh
Code Issues Proposed changes

Separate power and energy pollsters

Browse Source 
blueprint one-meter-per-plugin

Change-Id: I30c9b49df6ed7bc5b3a55323624040b28c8ad929
Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
This commit is contained in:
Doug Hellmann 2013-07-03 20:06:49 -04:00
parent a1f3554555
commit b2d998a623
3 changed files with 128 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ceilometer/energy/kwapi.py
View File

@ -78,12 +78,12 @@ class _Base(plugin.CentralPollster):
return list(client.iter_probes())
class KwapiPollster(_Base):
"""Kwapi pollster derived from the base class."""
class EnergyPollster(_Base):
"""Measures energy consumption."""
@staticmethod
def get_counter_names():
return ['energy', 'power']
return ['energy']
def get_counters(self, manager, cache):
"""Returns all counters."""
@ -100,6 +100,18 @@ class KwapiPollster(_Base):
probe['timestamp']).isoformat(),
resource_metadata={}
)
class PowerPollster(_Base):
"""Measures power consumption."""
@staticmethod
def get_counter_names():
return ['power']
def get_counters(self, manager, cache):
"""Returns all counters."""
for probe in self._iter_probes(manager.keystone, cache):
yield counter.Counter(
name='power',
type=counter.TYPE_GAUGE,

3
setup.cfg
View File

@ -68,7 +68,8 @@ ceilometer.poll.central =
network_floatingip = ceilometer.network.floatingip:FloatingIPPollster
image = ceilometer.image.glance:ImagePollster
objectstore = ceilometer.objectstore.swift:SwiftPollster
kwapi = ceilometer.energy.kwapi:KwapiPollster
energy = ceilometer.energy.kwapi:EnergyPollster
power = ceilometer.energy.kwapi:PowerPollster
ceilometer.storage =
log = ceilometer.storage.impl_log:LogStorage

155
tests/energy/test_kwapi.py
View File

@ -52,7 +52,35 @@ class TestManager(manager.AgentManager):
self.keystone = None
class TestKwapiPollster(base.TestCase):
class TestKwapi(base.TestCase):
@mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock())
def setUp(self):
super(TestKwapi, self).setUp()
self.context = context.get_admin_context()
self.manager = TestManager()
@staticmethod
def fake_get_kwapi_client(self, ksclient):
raise exceptions.EndpointNotFound("fake keystone exception")
def test_endpoint_not_exist(self):
self.stubs.Set(kwapi._Base, 'get_kwapi_client',
self.fake_get_kwapi_client)
counters = list(kwapi.EnergyPollster().get_counters(self.manager, {}))
self.assertEqual(len(counters), 0)
class TestEnergyPollster(base.TestCase):
@mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock())
def setUp(self):
super(TestEnergyPollster, self).setUp()
self.context = context.get_admin_context()
self.manager = TestManager()
self.stubs.Set(kwapi._Base, '_iter_probes',
self.fake_iter_probes)
@staticmethod
def fake_iter_probes(self, ksclient, cache):
@ -62,61 +90,100 @@ class TestKwapiPollster(base.TestCase):
probe_dict['id'] = key
yield probe_dict
@staticmethod
def fake_get_kwapi_client(self, ksclient):
raise exceptions.EndpointNotFound("fake keystone exception")
def test_counter(self):
cache = {}
counters = list(kwapi.EnergyPollster().get_counters(
self.manager,
cache,
))
self.assertEqual(len(counters), 3)
counters_by_name = dict((c.resource_id, c) for c in counters)
for name, probe in PROBE_DICT['probes'].items():
counter = counters_by_name[name]
expected = datetime.datetime.fromtimestamp(
probe['timestamp']
).isoformat()
self.assertEqual(counter.timestamp, expected)
self.assertEqual(counter.volume, probe['kwh'])
# self.assert_(
# any(map(lambda counter: counter.volume == probe['w'],
# power_counters)))
class TestEnergyPollsterCache(base.TestCase):
@mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock())
def setUp(self):
super(TestKwapiPollster, self).setUp()
super(TestEnergyPollsterCache, self).setUp()
self.context = context.get_admin_context()
self.manager = TestManager()
def test_endpoint_not_exist(self):
self.stubs.Set(kwapi._Base, 'get_kwapi_client',
self.fake_get_kwapi_client)
counters = list(kwapi.KwapiPollster().get_counters(self.manager, {}))
self.assertEqual(len(counters), 0)
def test_counter(self):
self.stubs.Set(kwapi._Base, '_iter_probes',
self.fake_iter_probes)
counters = list(kwapi.KwapiPollster().get_counters(self.manager, {}))
self.assertEqual(len(counters), 6)
energy_counters = [counter for counter in counters
if counter.name == "energy"]
power_counters = [counter for counter in counters
if counter.name == "power"]
for probe in PROBE_DICT['probes'].values():
self.assert_(
any(map(lambda counter: counter.timestamp ==
datetime.datetime.fromtimestamp(
probe['timestamp']).isoformat(),
counters)))
self.assert_(
any(map(lambda counter: counter.volume == probe['kwh'],
energy_counters)))
self.assert_(
any(map(lambda counter: counter.volume == probe['w'],
power_counters)))
def test_get_counters_cached(self):
probe = {'id': 'A'}
probe.update(PROBE_DICT['probes']['A'])
cache = {
kwapi.KwapiPollster.CACHE_KEY_PROBE: [probe],
kwapi.EnergyPollster.CACHE_KEY_PROBE: [probe],
}
self.manager.keystone = mock.Mock()
pollster = kwapi.KwapiPollster()
counters = list(pollster.get_counters(self.manager, cache))
self.assertEqual(len(counters), 2)
pollster = kwapi.EnergyPollster()
with mock.patch.object(pollster, '_get_probes') as do_not_call:
do_not_call.side_effect = AssertionError('should not be called')
counters = list(pollster.get_counters(self.manager, cache))
self.assertEqual(len(counters), 1)
def test_counter_list(self):
class TestPowerPollster(base.TestCase):
@mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock())
def setUp(self):
super(TestPowerPollster, self).setUp()
self.context = context.get_admin_context()
self.manager = TestManager()
self.stubs.Set(kwapi._Base, '_iter_probes',
self.fake_iter_probes)
pollster = kwapi.KwapiPollster()
counters = list(pollster.get_counters(self.manager, {}))
self.assertEqual(set([c.name for c in counters]),
set(pollster.get_counter_names()))
@staticmethod
def fake_iter_probes(self, ksclient, cache):
probes = PROBE_DICT['probes']
for key, value in probes.iteritems():
probe_dict = value
probe_dict['id'] = key
yield probe_dict
def test_counter(self):
cache = {}
counters = list(kwapi.PowerPollster().get_counters(
self.manager,
cache,
))
self.assertEqual(len(counters), 3)
counters_by_name = dict((c.resource_id, c) for c in counters)
for name, probe in PROBE_DICT['probes'].items():
counter = counters_by_name[name]
expected = datetime.datetime.fromtimestamp(
probe['timestamp']
).isoformat()
self.assertEqual(counter.timestamp, expected)
self.assertEqual(counter.volume, probe['w'])
class TestPowerPollsterCache(base.TestCase):
@mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock())
def setUp(self):
super(TestPowerPollsterCache, self).setUp()
self.context = context.get_admin_context()
self.manager = TestManager()
def test_get_counters_cached(self):
probe = {'id': 'A'}
probe.update(PROBE_DICT['probes']['A'])
cache = {
kwapi.PowerPollster.CACHE_KEY_PROBE: [probe],
}
self.manager.keystone = mock.Mock()
pollster = kwapi.PowerPollster()
with mock.patch.object(pollster, '_get_probes') as do_not_call:
do_not_call.side_effect = AssertionError('should not be called')
counters = list(pollster.get_counters(self.manager, cache))
self.assertEqual(len(counters), 1)