Merge "[MON] Fixes notifier bug during alarm triggering"

diff --git a/osm_mon/plugins/OpenStack/Aodh/notifier.py b/osm_mon/plugins/OpenStack/Aodh/notifier.py
index 92674cb..1de3284 100644 (file)
--- a/osm_mon/plugins/OpenStack/Aodh/notifier.py
+++ b/osm_mon/plugins/OpenStack/Aodh/notifier.py
@@ -72,11 +72,11 @@ class NotifierHandler(BaseHTTPRequestHandler):
             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")
 

diff --git a/osm_mon/test/OpenStack/unit/test_notifier.py b/osm_mon/test/OpenStack/unit/test_notifier.py
index f0fbf55..e2695d4 100644 (file)
--- a/osm_mon/test/OpenStack/unit/test_notifier.py
+++ b/osm_mon/test/OpenStack/unit/test_notifier.py
@@ -52,7 +52,7 @@ class Response(object):
 
 class RFile():
     def read(self, content_length):
-        return post_data
+        return json.dumps(post_data, sort_keys=True)
 
 
 class MockNotifierHandler(NotifierHandler):
@@ -98,7 +98,7 @@ class TestNotifier(unittest.TestCase):
         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, "publish_alarm_response")
     @mock.patch.object(DatabaseManager, "get_alarm")