post_data = post_data.decode()
except AttributeError:
pass
- log.info("This alarm was triggered: %s", json.dumps(post_data))
+ log.info("This alarm was triggered: %s", post_data)
# Send alarm notification to message bus
try:
- self.notify_alarm(json.dumps(post_data))
+ self.notify_alarm(json.loads(post_data))
except Exception:
log.exception("Error notifying alarm")
sev=values['severity'],
date=a_date,
state=values['current'])
- producer.notify_alarm(
+ producer.publish_alarm_response(
'notify_alarm', resp_message)
log.info("Sent alarm notification: %s", resp_message)
class RFile():
def read(self, content_length):
- return post_data
+ return json.dumps(post_data, sort_keys=True)
class MockNotifierHandler(NotifierHandler):
self.handler.do_POST()
set_head.assert_called_once()
- notify.assert_called_with(json.dumps(post_data))
+ notify.assert_called_with(post_data)
- @mock.patch.object(KafkaProducer, "notify_alarm")
+ @mock.patch.object(KafkaProducer, "publish_alarm_response")
@mock.patch.object(DatabaseManager, "get_alarm")
def test_notify_alarm_valid_alarm(
self, get_alarm, notify):
notify.assert_called_with("notify_alarm", mock.ANY)
- @mock.patch.object(KafkaProducer, "notify_alarm")
+ @mock.patch.object(KafkaProducer, "publish_alarm_response")
@mock.patch.object(DatabaseManager, "get_alarm")
def test_notify_alarm_invalid_alarm(
self, get_alarm, notify):