Revert "Add the PATCH method for the monitoring API"

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

diff --git a/o2app/entrypoints/redis_eventconsumer.py b/o2app/entrypoints/redis_eventconsumer.py
index 98e198b..c95133a 100644 (file)
--- a/o2app/entrypoints/redis_eventconsumer.py
+++ b/o2app/entrypoints/redis_eventconsumer.py
@@ -18,6 +18,7 @@ import redis
 import json
 from o2app import bootstrap
 from o2common.config import config
+from o2common.adapter.notifications import SmoNotifications
 from o2dms.domain import commands
 from o2ims.domain import commands as imscmd
 from o2ims.domain.subscription_obj import Message2SMO, RegistrationMessage
@@ -30,15 +31,23 @@ 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()
+
+    notifications = SmoNotifications()
+    bus = bootstrap.bootstrap(notifications=notifications)
+
     pubsub = r.pubsub(ignore_subscribe_messages=True)
     pubsub.subscribe("NfDeploymentStateChanged")
-    pubsub.subscribe('ResourceChanged')
     pubsub.subscribe('OcloudChanged')
+    pubsub.subscribe('ResourceTypeChanged')
+    pubsub.subscribe('ResourcePoolChanged')
+    pubsub.subscribe('DmsChanged')
+    pubsub.subscribe('ResourceChanged')
     pubsub.subscribe('AlarmEventChanged')
 
     for m in pubsub.listen():
@@ -62,30 +71,68 @@ def handle_changed(m, bus):
             ToState=data['ToState']
         )
         bus.handle(cmd)
+    elif channel == 'ResourceTypeChanged':
+        datastr = m['data']
+        data = json.loads(datastr)
+        logger.info('ResourceTypeChanged with cmd:{}'.format(data))
+        ref = apibase + inventory_api_version + '/resourceTypes/' + \
+            data['id']
+        cmd = imscmd.PubMessage2SMO(data=Message2SMO(
+            id=data['id'], ref=ref,
+            eventtype=data['notificationEventType'],
+            updatetime=data['updatetime']),
+            type='ResourceType')
+        bus.handle(cmd)
+    elif channel == 'ResourcePoolChanged':
+        datastr = m['data']
+        data = json.loads(datastr)
+        logger.info('ResourcePoolChanged with cmd:{}'.format(data))
+        ref = apibase + inventory_api_version + '/resourcePools/' + \
+            data['id']
+        cmd = imscmd.PubMessage2SMO(data=Message2SMO(
+            id=data['id'], ref=ref,
+            eventtype=data['notificationEventType'],
+            updatetime=data['updatetime']),
+            type='ResourcePool')
+        bus.handle(cmd)
+    elif channel == 'DmsChanged':
+        datastr = m['data']
+        data = json.loads(datastr)
+        logger.info('ResourceChanged with cmd:{}'.format(data))
+        ref = apibase + inventory_api_version + '/deploymentManagers/' + \
+            data['id']
+        cmd = imscmd.PubMessage2SMO(data=Message2SMO(
+            id=data['id'], ref=ref,
+            eventtype=data['notificationEventType'],
+            updatetime=data['updatetime']),
+            type='Dms')
+        bus.handle(cmd)
     elif channel == 'ResourceChanged':
         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'],
-            updatetime=data['updatetime']))
+            updatetime=data['updatetime']),
+            type='Resource')
         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']))
+            id=data['id'], eventtype=data['notificationEventType'],
+            updatetime=data['updatetime']))
         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']
+        ref = api_monitoring_base + \
+            monitor_api_version + '/alarms/' + data['id']
         cmd = imscmd.PubAlarm2SMO(data=AlarmEvent2SMO(
             id=data['id'], ref=ref,
             eventtype=data['notificationEventType'],