X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2app%2Fentrypoints%2Fredis_eventconsumer.py;h=cc34099bfebb2c3ffd476577d2b1db533ccab158;hb=b2bda65ba534ae72433f914f70384666e369ea0a;hp=1d38f0485f13c2a20f1c0a0e20899a6bfa594d7b;hpb=5ad82f634e2f10aaeccf1d2420fafc63e2d0056e;p=pti%2Fo2.git

diff --git a/o2app/entrypoints/redis_eventconsumer.py b/o2app/entrypoints/redis_eventconsumer.py
index 1d38f04..cc34099 100644
--- a/o2app/entrypoints/redis_eventconsumer.py
+++ b/o2app/entrypoints/redis_eventconsumer.py
@@ -13,49 +13,89 @@
 #  limitations under the License.
 
 # import json
-from logging import log
+
 import redis
 import json
 from o2app import bootstrap
 from o2common.config import config
-# from o2common.domain import commands
 from o2dms.domain import commands
-from o2dms.domain import events
+from o2ims.domain import commands as imscmd
+from o2ims.domain.subscription_obj import Message2SMO, RegistrationMessage
+from o2ims.domain.alarm_obj import AlarmEvent2SMO
 
 from o2common.helper import o2logging
 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()
+monitor_api_version = config.get_o2ims_monitoring_api_v1()
+inventory_api_version = config.get_o2ims_inventory_api_v1()
+
 
 def main():
     logger.info("Redis pubsub starting")
     bus = bootstrap.bootstrap()
     pubsub = r.pubsub(ignore_subscribe_messages=True)
-    pubsub.subscribe("NfDeploymentCreated")
+    pubsub.subscribe("NfDeploymentStateChanged")
+    pubsub.subscribe('ResourceChanged')
+    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 == "NfDeploymentCreated":
+    if channel == "NfDeploymentStateChanged":
+        datastr = m['data']
+        data = json.loads(datastr)
+        logger.info('HandleNfDeploymentStateChanged with cmd:{}'.format(data))
+        cmd = commands.HandleNfDeploymentStateChanged(
+            NfDeploymentId=data['NfDeploymentId'],
+            FromState=data['FromState'],
+            ToState=data['ToState']
+        )
+        bus.handle(cmd)
+    elif channel == 'ResourceChanged':
+        datastr = m['data']
+        data = json.loads(datastr)
+        logger.info('ResourceChanged with cmd:{}'.format(data))
+        ref = apibase + inventory_api_version + '/resourcePools/' + \
+            data['resourcePoolId'] + '/resources/' + data['id']
+        cmd = imscmd.PubMessage2SMO(data=Message2SMO(
+            id=data['id'], ref=ref,
+            eventtype=data['notificationEventType'],
+            updatetime=data['updatetime']))
+        bus.handle(cmd)
+    elif channel == 'OcloudChanged':
+        datastr = m['data']
+        data = json.loads(datastr)
+        logger.info('OcloudChanged with cmd:{}'.format(data))
+        cmd = imscmd.Register2SMO(data=RegistrationMessage(
+            data['notificationEventType'],
+            id=data['id']))
+        bus.handle(cmd)
+    elif channel == 'AlarmEventChanged':
         datastr = m['data']
         data = json.loads(datastr)
-        logger.info('InstallNfDeployment with cmd:{}'.format(data))
-        cmd = commands.InstallNfDeployment(NfDeploymentId = data['NfDeploymentId'])
+        logger.info('AlarmEventChanged with cmd:{}'.format(data))
+        ref = api_monitoring_base + \
+            monitor_api_version + '/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))
-    # data = json.loads(m["data"])
-    # cmd = commands.UpdateDms(ref=data["dmsid"])
-    # bus.handle(cmd)
 
 
 if __name__ == "__main__":