Add subscription and notification for resource changes; fix a bug while pserver node...

[pti/o2.git] / o2app / entrypoints / redis_eventconsumer.py

diff --git a/o2app/entrypoints/redis_eventconsumer.py b/o2app/entrypoints/redis_eventconsumer.py
index 8472949..ea49edd 100644 (file)
--- a/o2app/entrypoints/redis_eventconsumer.py
+++ b/o2app/entrypoints/redis_eventconsumer.py
@@ -13,26 +13,29 @@
 #  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 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("NfDeploymentStateChanged")
+    pubsub.subscribe('ResourceChanged')
 
     for m in pubsub.listen():
         try:
@@ -50,11 +53,22 @@ def handle_dms_changed(m, bus):
         data = json.loads(datastr)
         logger.info('HandleNfDeploymentStateChanged with cmd:{}'.format(data))
         cmd = commands.HandleNfDeploymentStateChanged(
-            NfDeploymentId = data['NfDeploymentId'],
-            FromState = data['FromState'],
-            ToState = data['ToState']
+            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))