X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2app%2Fentrypoints%2Fredis_eventconsumer.py;h=04ef31c371360ab034f0459bac89e2e5fed6fd90;hb=d2f6cc674bf3623caf114a8d7709e70d55ec9340;hp=56301747563ae87b21ffa9b65cd436df911f5d34;hpb=c76580a35c3461254e1d8c91025019f52f723021;p=pti%2Fo2.git

diff --git a/o2app/entrypoints/redis_eventconsumer.py b/o2app/entrypoints/redis_eventconsumer.py
index 5630174..04ef31c 100644
--- a/o2app/entrypoints/redis_eventconsumer.py
+++ b/o2app/entrypoints/redis_eventconsumer.py
@@ -24,11 +24,13 @@ from o2ims.domain import commands as imscmd
 from o2common.helper import o2logging
 from o2ims.domain.subscription_obj import Message2SMO, NotificationEventEnum,\
     RegistrationMessage
+from o2ims.domain.alarm_obj import AlarmEvent2SMO
 logger = o2logging.get_logger(__name__)
 
 r = redis.Redis(**config.get_redis_host_and_port())
 
 apibase = config.get_o2ims_api_base()
+api_monitoring_base = config.get_o2ims_monitoring_api_base()
 
 
 def main():
@@ -39,16 +41,17 @@ def main():
     pubsub.subscribe('ResourceChanged')
     pubsub.subscribe('ConfigurationChanged')
     pubsub.subscribe('OcloudChanged')
+    pubsub.subscribe('AlarmEventChanged')
 
     for m in pubsub.listen():
         try:
-            handle_dms_changed(m, bus)
+            handle_changed(m, bus)
         except Exception as ex:
             logger.warning("{}".format(str(ex)))
             continue
 
 
-def handle_dms_changed(m, bus):
+def handle_changed(m, bus):
     logger.info("handling %s", m)
     channel = m['channel'].decode("UTF-8")
     if channel == "NfDeploymentStateChanged":
@@ -85,6 +88,16 @@ def handle_dms_changed(m, bus):
         if data['notificationEventType'] == NotificationEventEnum.CREATE:
             cmd = imscmd.Register2SMO(data=RegistrationMessage(is_all=True))
             bus.handle(cmd)
+    elif channel == 'AlarmEventChanged':
+        datastr = m['data']
+        data = json.loads(datastr)
+        logger.info('AlarmEventChanged with cmd:{}'.format(data))
+        ref = api_monitoring_base + '/alarms/' + data['id']
+        cmd = imscmd.PubAlarm2SMO(data=AlarmEvent2SMO(
+            id=data['id'], ref=ref,
+            eventtype=data['notificationEventType'],
+            updatetime=data['updatetime']))
+        bus.handle(cmd)
     else:
         logger.info("unhandled:{}".format(channel))