openstack/aodh
Code Issues Proposed changes

Add the alarm id to the rest notifier body

Browse Source 
This improves the recording of events from the client.
In the tests change the alarm to a string  to better match
what is actually returned (the alarm_id).

Change-Id: I4c577c3eafdadae20912dea2ff584a9e358b171c
This commit is contained in:
Angus Salkeld
2013-08-06 14:14:58 +10:00
parent 0fce3cb36b
commit 4947979514
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ceilometer/alarm/notifier/rest.py
View File

@@ -56,7 +56,7 @@ class RestAlarmNotifier(notifier.AlarmNotifier):
def notify(action, alarm, state, reason):
LOG.info("Notifying alarm %s in state %s with action %s because %s",
alarm, state, action, reason)
body = {'state': state, 'reason': reason}
body = {'alarm': alarm, 'state': state, 'reason': reason}
kwargs = {'data': jsonutils.dumps(body)}
if action.scheme == 'https':

32
tests/alarm/test_notifier.py
View File

@@ -43,7 +43,7 @@ class TestAlarmNotifier(base.TestCase):
def test_notify_alarm(self):
data = {
'actions': ['test://'],
'alarm': {'name': 'foobar'},
'alarm': 'foobar',
'state': 'ALARM',
'reason': 'Everything is on fire',
}
@@ -63,7 +63,7 @@ class TestAlarmNotifier(base.TestCase):
self.service.notify_alarm(context.get_admin_context(),
{
'actions': ['log://'],
'alarm': {'name': 'foobar'},
'alarm': 'foobar',
'condition': {'threshold': 42},
})
@@ -73,14 +73,14 @@ class TestAlarmNotifier(base.TestCase):
def test_notify_alarm_rest_action_ok(self):
action = 'http://host/action'
data_json = '{"state": "ALARM", "reason": "what ?"}'
data_json = '{"reason": "what ?", "alarm": "foobar", "state": "ALARM"}'
with mock.patch('eventlet.spawn_n', self._fake_spawn_n):
with mock.patch.object(requests, 'post') as poster:
self.service.notify_alarm(context.get_admin_context(),
{
'actions': [action],
'alarm': {'name': 'foobar'},
'alarm': 'foobar',
'condition': {'threshold': 42},
'reason': 'what ?',
'state': 'ALARM',
@@ -90,7 +90,7 @@ class TestAlarmNotifier(base.TestCase):
def test_notify_alarm_rest_action_with_ssl_client_cert(self):
action = 'https://host/action'
certificate = "/etc/ssl/cert/whatever.pem"
data_json = '{"state": "ALARM", "reason": "what ?"}'
data_json = '{"reason": "what ?", "alarm": "foobar", "state": "ALARM"}'
cfg.CONF.set_override("rest_notifier_certificate_file", certificate,
group='alarm')
@@ -100,7 +100,7 @@ class TestAlarmNotifier(base.TestCase):
self.service.notify_alarm(context.get_admin_context(),
{
'actions': [action],
'alarm': {'name': 'foobar'},
'alarm': 'foobar',
'condition': {'threshold': 42},
'reason': 'what ?',
'state': 'ALARM',
@@ -112,7 +112,7 @@ class TestAlarmNotifier(base.TestCase):
action = 'https://host/action'
certificate = "/etc/ssl/cert/whatever.pem"
key = "/etc/ssl/cert/whatever.key"
data_json = '{"state": "ALARM", "reason": "what ?"}'
data_json = '{"reason": "what ?", "alarm": "foobar", "state": "ALARM"}'
cfg.CONF.set_override("rest_notifier_certificate_file", certificate,
group='alarm')
@@ -124,7 +124,7 @@ class TestAlarmNotifier(base.TestCase):
self.service.notify_alarm(context.get_admin_context(),
{
'actions': [action],
'alarm': {'name': 'foobar'},
'alarm': 'foobar',
'condition': {'threshold': 42},
'reason': 'what ?',
'state': 'ALARM',
@@ -134,7 +134,7 @@ class TestAlarmNotifier(base.TestCase):
def test_notify_alarm_rest_action_with_ssl_verify_disable_by_cfg(self):
action = 'https://host/action'
data_json = '{"state": "ALARM", "reason": "what ?"}'
data_json = '{"reason": "what ?", "alarm": "foobar", "state": "ALARM"}'
cfg.CONF.set_override("rest_notifier_ssl_verify", False,
group='alarm')
@@ -144,7 +144,7 @@ class TestAlarmNotifier(base.TestCase):
self.service.notify_alarm(context.get_admin_context(),
{
'actions': [action],
'alarm': {'name': 'foobar'},
'alarm': 'foobar',
'condition': {'threshold': 42},
'reason': 'what ?',
'state': 'ALARM',
@@ -154,14 +154,14 @@ class TestAlarmNotifier(base.TestCase):
def test_notify_alarm_rest_action_with_ssl_verify_disable(self):
action = 'https://host/action?ceilometer-alarm-ssl-verify=0'
data_json = '{"state": "ALARM", "reason": "what ?"}'
data_json = '{"reason": "what ?", "alarm": "foobar", "state": "ALARM"}'
with mock.patch('eventlet.spawn_n', self._fake_spawn_n):
with mock.patch.object(requests, 'post') as poster:
self.service.notify_alarm(context.get_admin_context(),
{
'actions': [action],
'alarm': {'name': 'foobar'},
'alarm': 'foobar',
'condition': {'threshold': 42},
'reason': 'what ?',
'state': 'ALARM',
@@ -171,7 +171,7 @@ class TestAlarmNotifier(base.TestCase):
def test_notify_alarm_rest_action_with_ssl_verify_enable_by_user(self):
action = 'https://host/action?ceilometer-alarm-ssl-verify=1'
data_json = '{"state": "ALARM", "reason": "what ?"}'
data_json = '{"reason": "what ?", "alarm": "foobar", "state": "ALARM"}'
cfg.CONF.set_override("rest_notifier_ssl_verify", False,
group='alarm')
@@ -181,7 +181,7 @@ class TestAlarmNotifier(base.TestCase):
self.service.notify_alarm(context.get_admin_context(),
{
'actions': [action],
'alarm': {'name': 'foobar'},
'alarm': 'foobar',
'condition': {'threshold': 42},
'reason': 'what ?',
'state': 'ALARM',
@@ -202,7 +202,7 @@ class TestAlarmNotifier(base.TestCase):
context.get_admin_context(),
{
'actions': ['no-such-action-i-am-sure'],
'alarm': {'name': 'foobar'},
'alarm': 'foobar',
'condition': {'threshold': 42},
})
self.assertTrue(LOG.error.called)
@@ -214,7 +214,7 @@ class TestAlarmNotifier(base.TestCase):
context.get_admin_context(),
{
'actions': ['no-such-action-i-am-sure://'],
'alarm': {'name': 'foobar'},
'alarm': 'foobar',
'condition': {'threshold': 42},
})
self.assertTrue(LOG.error.called)