Code Review
/
pti
/
o2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Adjust some debug level to make consistent.
[pti/o2.git]
/
o2app
/
entrypoints
/
redis_eventconsumer.py
diff --git
a/o2app/entrypoints/redis_eventconsumer.py
b/o2app/entrypoints/redis_eventconsumer.py
index
98e198b
..
cc34099
100644
(file)
--- a/
o2app/entrypoints/redis_eventconsumer.py
+++ b/
o2app/entrypoints/redis_eventconsumer.py
@@
-30,6
+30,8
@@
r = redis.Redis(**config.get_redis_host_and_port())
apibase = config.get_o2ims_api_base()
api_monitoring_base = config.get_o2ims_monitoring_api_base()
apibase = config.get_o2ims_api_base()
api_monitoring_base = config.get_o2ims_monitoring_api_base()
+monitor_api_version = config.get_o2ims_monitoring_api_v1()
+inventory_api_version = config.get_o2ims_inventory_api_v1()
def main():
def main():
@@
-66,8
+68,8
@@
def handle_changed(m, bus):
datastr = m['data']
data = json.loads(datastr)
logger.info('ResourceChanged with cmd:{}'.format(data))
datastr = m['data']
data = json.loads(datastr)
logger.info('ResourceChanged with cmd:{}'.format(data))
- ref = apibase +
'/resourcePools/' + data['resourcePoolId'] +
\
- '/resources/' + data['id']
+ ref = apibase +
inventory_api_version + '/resourcePools/' +
\
+
data['resourcePoolId'] +
'/resources/' + data['id']
cmd = imscmd.PubMessage2SMO(data=Message2SMO(
id=data['id'], ref=ref,
eventtype=data['notificationEventType'],
cmd = imscmd.PubMessage2SMO(data=Message2SMO(
id=data['id'], ref=ref,
eventtype=data['notificationEventType'],
@@
-85,7
+87,8
@@
def handle_changed(m, bus):
datastr = m['data']
data = json.loads(datastr)
logger.info('AlarmEventChanged with cmd:{}'.format(data))
datastr = m['data']
data = json.loads(datastr)
logger.info('AlarmEventChanged with cmd:{}'.format(data))
- ref = api_monitoring_base + '/alarms/' + data['id']
+ ref = api_monitoring_base + \
+ monitor_api_version + '/alarms/' + data['id']
cmd = imscmd.PubAlarm2SMO(data=AlarmEvent2SMO(
id=data['id'], ref=ref,
eventtype=data['notificationEventType'],
cmd = imscmd.PubAlarm2SMO(data=AlarmEvent2SMO(
id=data['id'], ref=ref,
eventtype=data['notificationEventType'],