X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2app%2Fentrypoints%2Fredis_eventconsumer.py;h=cc34099bfebb2c3ffd476577d2b1db533ccab158;hb=refs%2Fchanges%2F14%2F9814%2F1;hp=98e198b9d88ea970e90b25f336418132bd8ad728;hpb=9ee90ffa2414326c26fd10edc59bf315204254e2;p=pti%2Fo2.git diff --git a/o2app/entrypoints/redis_eventconsumer.py b/o2app/entrypoints/redis_eventconsumer.py index 98e198b..cc34099 100644 --- 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() +monitor_api_version = config.get_o2ims_monitoring_api_v1() +inventory_api_version = config.get_o2ims_inventory_api_v1() 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)) - 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'], @@ -85,7 +87,8 @@ def handle_changed(m, bus): 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'],