openstack/deb-ceilometer
Code Issues Proposed changes

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

Browse Source 
Use old name of the 'hardware.ipmi.node.temperature' as currently there
is no proper deprecation process for meters.

DocImpact

Partially Closes-Bug: #1439766

Change-Id: Ic71bcda4008f1b4090e0d9c8908201440abb02a4
This commit is contained in:
Ildiko Vancsa 2015-04-03 09:57:37 +02:00
parent bf72980e5d
commit 75a80ca0b5
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

@ -150,7 +150,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