Skip to content

Commit

Permalink
Use old name of 'hardware.ipmi.node.temperature'
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Ildiko Vancsa committed Apr 3, 2015
1 parent bf72980 commit 75a80ca
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
6 changes: 5 additions & 1 deletion ceilometer/ipmi/pollsters/node.py
Expand Up @@ -95,7 +95,11 @@ def get_samples(self, manager, cache, resources):


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"

Expand Down
2 changes: 1 addition & 1 deletion ceilometer/tests/agent/test_manager.py
Expand Up @@ -76,7 +76,7 @@ def test_load_failed_plugins(self, LOG):

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,
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Expand Up @@ -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
Expand Down

0 comments on commit 75a80ca

Please sign in to comment.