From: lavado <glavado@whitestack.com>
Date: Fri, 6 Jul 2018 19:14:23 +0000 (+0200)
Subject: Merge "[MON] Fixes notifier bug during alarm triggering"
X-Git-Tag: BUILD_v4.0.1_1^0
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=6418f698822467c91e6685647297f3f606e00809;hp=a4ffa936b4f8a2bfcd1b64541e00c93aac449a56;p=osm%2FMON.git

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
--- 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
--- 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")