combination alarm state retrieval always fails

[Eoghan Glynn]

The retrieval of state for the constituent alarms always fails for combination alarms, due to an incorrect attribute of ceilometerclient being used:

2013-10-09 19:46:26.731 24995 ERROR ceilometer.alarm.evaluator.combination [-] alarm retrieval failed
2013-10-09 19:46:26.731 24995 TRACE ceilometer.alarm.evaluator.combination Traceback (most recent call last):
2013-10-09 19:46:26.731 24995 TRACE ceilometer.alarm.evaluator.combination File "/usr/lib/python2.7/site-packages/ceilometer/alarm/evaluator/combination.py", line 34, in _get_alarm_state
2013-10-09 19:46:26.731 24995 TRACE ceilometer.alarm.evaluator.combination alarm = self._client.alarm.get(alarm_id)
2013-10-09 19:46:26.731 24995 TRACE ceilometer.alarm.evaluator.combination AttributeError: 'Client' object has no attribute 'alarm'

The correct attribute is pluralized, i.e. _client.alarms as opposed to _client.alarm.

As a result combination alarms can never be successfully evaluated.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/50714

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/50714
Committed: http://github.com/openstack/ceilometer/commit/f44e292e7a16d09db36d8b2f9223e3d54202f8d2
Submitter: Jenkins
Branch: master

commit f44e292e7a16d09db36d8b2f9223e3d54202f8d2
Author: Eoghan Glynn <email address hidden>
Date: Wed Oct 9 19:57:10 2013 +0100

    Ensure combination alarms can be evaluated

    Fixes bug 1237589

    Previously the retrieval of state for the constituent alarms always
    failed for combination alarms, due to an incorrect attribute of
    ceilometerclient being used. As a result combination alarms could
    never be successfully evaluated.

    Now the correct pluralized attribute is used.

    Change-Id: Id58a5d185854367e5a08011048774ab5aed93d4e

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: milestone-proposed
Review: https://review.openstack.org/50975

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/50975
Committed: http://github.com/openstack/ceilometer/commit/019fd2a9fc74246fd09a18044b6dd555326416f4
Submitter: Jenkins
Branch: milestone-proposed

commit 019fd2a9fc74246fd09a18044b6dd555326416f4
Author: Eoghan Glynn <email address hidden>
Date: Wed Oct 9 19:57:10 2013 +0100

    Ensure combination alarms can be evaluated

    Fixes bug 1237589

    Previously the retrieval of state for the constituent alarms always
    failed for combination alarms, due to an incorrect attribute of
    ceilometerclient being used. As a result combination alarms could
    never be successfully evaluated.

    Now the correct pluralized attribute is used.

    Change-Id: Id58a5d185854367e5a08011048774ab5aed93d4e
    (cherry picked from commit f44e292e7a16d09db36d8b2f9223e3d54202f8d2)