projects
/
osm
/
MON.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adds yaml format in OpenStack plugin
[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
156a0f1
..
b0602bd
100644
(file)
--- a/
osm_mon/plugins/OpenStack/Aodh/alarming.py
+++ b/
osm_mon/plugins/OpenStack/Aodh/alarming.py
@@
-25,6
+25,7
@@
import json
import logging
import six
import logging
import six
+import yaml
from osm_mon.core.database import DatabaseManager
from osm_mon.core.message_bus.producer import KafkaProducer
from osm_mon.core.database import DatabaseManager
from osm_mon.core.message_bus.producer import KafkaProducer
@@
-91,7
+92,10
@@
class Alarming(object):
def alarming(self, message):
"""Consume info from the message bus to manage alarms."""
def alarming(self, message):
"""Consume info from the message bus to manage alarms."""
- values = json.loads(message.value)
+ try:
+ values = json.loads(message.value)
+ except ValueError:
+ values = yaml.safe_load(message.value)
log.info("OpenStack alarm action required.")
vim_uuid = values['vim_uuid']
log.info("OpenStack alarm action required.")
vim_uuid = values['vim_uuid']