X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2app%2Fentrypoints%2Fredis_eventconsumer.py;h=ea49edd7fd33041cb29e6adaefcb2065a42bf6f3;hb=5bf7465e213fa92b6514446e353e6f2da436371f;hp=188eb87f79c67ad7e10a07fe8ff80861fe77b23c;hpb=5e02e76308e1677fb106572b885a366eb6c0fbec;p=pti%2Fo2.git

diff --git a/o2app/entrypoints/redis_eventconsumer.py b/o2app/entrypoints/redis_eventconsumer.py
index 188eb87..ea49edd 100644
--- a/o2app/entrypoints/redis_eventconsumer.py
+++ b/o2app/entrypoints/redis_eventconsumer.py
@@ -14,32 +14,63 @@
 
 # import json
 import redis
-
+import json
 from o2app import bootstrap
 from o2common.config import config
 # from o2common.domain import commands
+from o2dms.domain import commands
+from o2ims.domain import commands as imscmd
 
 from o2common.helper import o2logging
+from o2ims.domain.subscription_obj import Message2SMO
 logger = o2logging.get_logger(__name__)
 
 r = redis.Redis(**config.get_redis_host_and_port())
 
+apibase = config.get_o2ims_api_base()
+
 
 def main():
     logger.info("Redis pubsub starting")
     bus = bootstrap.bootstrap()
     pubsub = r.pubsub(ignore_subscribe_messages=True)
-    pubsub.subscribe("dms_changed")
+    pubsub.subscribe("NfDeploymentStateChanged")
+    pubsub.subscribe('ResourceChanged')
 
     for m in pubsub.listen():
-        handle_dms_changed(m, bus)
+        try:
+            handle_dms_changed(m, bus)
+        except Exception as ex:
+            logger.warning("{}".format(str(ex)))
+            continue
 
 
 def handle_dms_changed(m, bus):
     logger.info("handling %s", m)
-    # data = json.loads(m["data"])
-    # cmd = commands.UpdateDms(ref=data["dmsid"])
-    # bus.handle(cmd)
+    channel = m['channel'].decode("UTF-8")
+    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)
+    if channel == 'ResourceChanged':
+        datastr = m['data']
+        data = json.loads(datastr)
+        logger.info('ResourceChanged with cmd:{}'.format(data))
+        ref = apibase + '/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)
+    else:
+        logger.info("unhandled:{}".format(channel))
 
 
 if __name__ == "__main__":