openstack/aodh
Code Issues Proposed changes

Merge "Use old name of 'hardware.ipmi.node.temperature'"

Browse Source
This commit is contained in:
Jenkins 2015-04-07 14:12:04 +00:00 committed by Gerrit Code Review
commit ce4957801e
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ceilometer/ipmi/pollsters/node.py
View File

@ -95,7 +95,11 @@ class _Base(plugin_base.PollsterBase):
class InletTemperaturePollster(_Base):
NAME = "hardware.ipmi.node.inlet_temperature"
# Note(ildikov): The new meter name should be
# "hardware.ipmi.node.inlet_temperature". As currently there
# is no meter deprecation support in the code, we should use the
# old name in order to avoid confusion.
NAME = "hardware.ipmi.node.temperature"
TYPE = sample.TYPE_GAUGE
UNIT = "C"

2
ceilometer/tests/agent/test_manager.py
View File

@ -76,7 +76,7 @@ class TestManager(base.BaseTestCase):
err_msg = 'Skip loading extension for hardware.ipmi.node.%s'
pollster_names = [
'power', 'inlet_temperature', 'outlet_temperature',
'power', 'temperature', 'outlet_temperature',
'airflow', 'cups', 'cpu_util', 'mem_util', 'io_util']
calls = [mock.call(err_msg % n) for n in pollster_names]
LOG.error.assert_has_calls(calls=calls,

2
setup.cfg
View File

@ -152,7 +152,7 @@ ceilometer.poll.compute =
ceilometer.poll.ipmi =
hardware.ipmi.node.power = ceilometer.ipmi.pollsters.node:PowerPollster
hardware.ipmi.node.inlet_temperature = ceilometer.ipmi.pollsters.node:InletTemperaturePollster
hardware.ipmi.node.temperature = ceilometer.ipmi.pollsters.node:InletTemperaturePollster
hardware.ipmi.node.outlet_temperature = ceilometer.ipmi.pollsters.node:OutletTemperaturePollster
hardware.ipmi.node.airflow = ceilometer.ipmi.pollsters.node:AirflowPollster
hardware.ipmi.node.cups = ceilometer.ipmi.pollsters.node:CUPSIndexPollster