Updated Openstack plugin logging and tests

[osm/MON.git] / plugins / OpenStack / Aodh / alarming.py

diff --git a/plugins/OpenStack/Aodh/alarming.py b/plugins/OpenStack/Aodh/alarming.py
index 3c6d4d1..d409d71 100644 (file)
--- a/plugins/OpenStack/Aodh/alarming.py
+++ b/plugins/OpenStack/Aodh/alarming.py
@@ -22,7 +22,8 @@
 """Carry out alarming requests via Aodh API."""
 
 import json
-import logging as log
+import logging
+log = logging.getLogger(__name__)
 
 from core.message_bus.producer import KafkaProducer
 
@@ -102,10 +103,14 @@ class Alarming(object):
 
                     # Generate a valid response message, send via producer
                     try:
+                        if alarm_status is True:
+                            log.info("Alarm successfully created")
+
                         resp_message = self._response.generate_response(
                             'create_alarm_response', status=alarm_status,
                             alarm_id=alarm_id,
                             cor_id=alarm_details['correlation_id'])
+                        log.info("Response Message: %s", resp_message)
                         self._producer.create_alarm_response(
                             'create_alarm_resonse', resp_message,
                             'alarm_response')
@@ -125,6 +130,7 @@ class Alarming(object):
                         resp_message = self._response.generate_response(
                             'list_alarm_response', alarm_list=alarm_list,
                             cor_id=list_details['correlation_id'])
+                        log.info("Response Message: %s", resp_message)
                         self._producer.list_alarm_response(
                             'list_alarm_response', resp_message,
                             'alarm_response')
@@ -144,6 +150,7 @@ class Alarming(object):
                             'delete_alarm_response', alarm_id=alarm_id,
                             status=resp_status,
                             cor_id=request_details['correlation_id'])
+                        log.info("Response message: %s", resp_message)
                         self._producer.delete_alarm_response(
                             'delete_alarm_response', resp_message,
                             'alarm_response')
@@ -176,6 +183,7 @@ class Alarming(object):
                             'update_alarm_response', alarm_id=alarm_id,
                             cor_id=alarm_details['correlation_id'],
                             status=status)
+                        log.info("Response message: %s", resp_message)
                         self._producer.update_alarm_response(
                             'update_alarm_response', resp_message,
                             'alarm_response')
@@ -233,6 +241,7 @@ class Alarming(object):
             result = self._common._perform_request(
                 url, auth_token, req_type="delete")
             if str(result.status_code) == "404":
+                log.info("Alarm doesn't exist: %s", result.status_code)
                 # If status code is 404 alarm did not exist
                 return False
             else: