Removes call to .lower on vnf_member_index in alarm creation

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

diff --git a/osm_mon/plugins/OpenStack/Aodh/alarming.py b/osm_mon/plugins/OpenStack/Aodh/alarming.py
index 44b8fdd..cea12ba 100644 (file)
--- a/osm_mon/plugins/OpenStack/Aodh/alarming.py
+++ b/osm_mon/plugins/OpenStack/Aodh/alarming.py
@@ -108,7 +108,7 @@ class Alarming(object):
                                                   alarm_details['operation'].lower(),
                                                   alarm_details['metric_name'].lower(),
                                                   alarm_details['vdu_name'].lower(),
-                                                  alarm_details['vnf_member_index'].lower(),
+                                                  alarm_details['vnf_member_index'],
                                                   alarm_details['ns_id'].lower()
                                                   )
                 status = True
@@ -177,7 +177,7 @@ class Alarming(object):
                 log.exception("Error updating alarm")
                 raise e
             finally:
-                self._generate_and_send_response('create_alarm_response',
+                self._generate_and_send_response('update_alarm_response',
                                                  alarm_details['correlation_id'],
                                                  status=status,
                                                  alarm_id=alarm_id)
@@ -387,13 +387,13 @@ class Alarming(object):
             log.exception("Desired Gnocchi metric not found:", e)
             raise e
 
-    def _generate_and_send_response(self, topic, correlation_id, **kwargs):
+    def _generate_and_send_response(self, key, correlation_id, **kwargs):
         try:
             resp_message = self._response.generate_response(
-                topic, cor_id=correlation_id, **kwargs)
+                key, cor_id=correlation_id, **kwargs)
             log.info("Response Message: %s", resp_message)
-            self._producer.create_alarm_response(
-                topic, resp_message)
+            self._producer.publish_alarm_response(
+                key, resp_message)
         except Exception as e:
             log.exception("Response creation failed:")
             raise e