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

diff --git a/o2app/entrypoints/redis_eventconsumer.py b/o2app/entrypoints/redis_eventconsumer.py
index 04ef31c..1410f76 100644
--- a/o2app/entrypoints/redis_eventconsumer.py
+++ b/o2app/entrypoints/redis_eventconsumer.py
@@ -13,24 +13,25 @@
 #  limitations under the License.
 
 # 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 o2ims.domain.subscription_obj import Message2SMO, RegistrationMessage
+from o2ims.domain.alarm_obj import AlarmEvent2SMO
 
 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()
+monitor_api_version = config.get_o2ims_monitoring_api_v1()
+inventory_api_version = config.get_o2ims_inventory_api_v1()
 
 
 def main():
@@ -38,9 +39,11 @@ def main():
     bus = bootstrap.bootstrap()
     pubsub = r.pubsub(ignore_subscribe_messages=True)
     pubsub.subscribe("NfDeploymentStateChanged")
-    pubsub.subscribe('ResourceChanged')
-    pubsub.subscribe('ConfigurationChanged')
     pubsub.subscribe('OcloudChanged')
+    pubsub.subscribe('ResourceTypeChanged')
+    pubsub.subscribe('ResourcePoolChanged')
+    pubsub.subscribe('DmsChanged')
+    pubsub.subscribe('ResourceChanged')
     pubsub.subscribe('AlarmEventChanged')
 
     for m in pubsub.listen():
@@ -64,35 +67,68 @@ def handle_changed(m, bus):
             ToState=data['ToState']
         )
         bus.handle(cmd)
-    elif channel == 'ResourceChanged':
+    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 + '/resourcePools/' + data['resourcePoolId'] +\
-            '/resources/' + data['id']
+        ref = apibase + inventory_api_version + '/deploymentManagers/' + \
+            data['id']
         cmd = imscmd.PubMessage2SMO(data=Message2SMO(
             id=data['id'], ref=ref,
             eventtype=data['notificationEventType'],
-            updatetime=data['updatetime']))
+            updatetime=data['updatetime']),
+            type='Dms')
         bus.handle(cmd)
-    elif channel == 'ConfigurationChanged':
+    elif channel == 'ResourceChanged':
         datastr = m['data']
         data = json.loads(datastr)
-        logger.info('ConfigurationChanged with cmd:{}'.format(data))
-        cmd = imscmd.Register2SMO(data=RegistrationMessage(id=data['id']))
+        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']),
+            type='Resource')
         bus.handle(cmd)
     elif channel == 'OcloudChanged':
         datastr = m['data']
         data = json.loads(datastr)
         logger.info('OcloudChanged with cmd:{}'.format(data))
-        if data['notificationEventType'] == NotificationEventEnum.CREATE:
-            cmd = imscmd.Register2SMO(data=RegistrationMessage(is_all=True))
-            bus.handle(cmd)
+        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('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'],