X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fservice%2Fcommand%2Fregistration_handler.py;fp=o2ims%2Fservice%2Fcommand%2Fregistration_handler.py;h=d3631498515bd6c7a68ba31824f321fde7357fc1;hb=209f349b35b0919ac133bc2264f25753a73e5b8f;hp=0a4395dbb347c22af505efa39f5b84f6c83589d0;hpb=a413c895f34fd2aa0eaa72254243673ae0477d27;p=pti%2Fo2.git

diff --git a/o2ims/service/command/registration_handler.py b/o2ims/service/command/registration_handler.py
index 0a4395d..d363149 100644
--- a/o2ims/service/command/registration_handler.py
+++ b/o2ims/service/command/registration_handler.py
@@ -23,7 +23,8 @@ from retry import retry
 from o2common.service.unit_of_work import AbstractUnitOfWork
 from o2common.config import config
 from o2ims.domain import commands
-from o2ims.domain.subscription_obj import RegistrationStatusEnum
+from o2ims.domain.configuration_obj import ConfigurationTypeEnum, \
+    RegistrationStatusEnum
 
 from o2common.helper import o2logging
 logger = o2logging.get_logger(__name__)
@@ -37,33 +38,36 @@ def registry_to_smo(
     data = cmd.data
     logger.info('The Register2SMO all is {}'.format(data.all))
     if data.all:
-        regs = uow.registrations.list()
-        for reg in regs:
-            reg_data = reg.serialize()
-            logger.debug('Registration: {}'.format(reg_data['registrationId']))
+        confs = uow.configrations.list()
+        for conf in confs:
+            if conf.conftype != ConfigurationTypeEnum.SMO:
+                continue
+            reg_data = conf.serialize()
+            logger.debug('Configuration: {}'.format(
+                reg_data['configurationId']))
 
             register_smo(uow, reg_data)
     else:
         with uow:
-            reg = uow.registrations.get(data.id)
-            if reg is None:
+            conf = uow.configurations.get(data.id)
+            if conf is None:
                 return
-            logger.debug('Registration: {}'.format(reg.registrationId))
-            reg_data = reg.serialize()
-            register_smo(uow, reg_data)
+            logger.debug('Configuration: {}'.format(conf.configurationId))
+            conf_data = conf.serialize()
+            register_smo(uow, conf_data)
 
 
 def register_smo(uow, reg_data):
     call_res = call_smo(reg_data)
     logger.debug('Call SMO response is {}'.format(call_res))
     if call_res:
-        reg = uow.registrations.get(reg_data['registrationId'])
+        reg = uow.configurations.get(reg_data['configurationId'])
         if reg is None:
             return
         reg.status = RegistrationStatusEnum.NOTIFIED
-        logger.debug('Updating Registration: {}'.format(
-            reg.registrationId))
-        uow.registrations.update(reg)
+        logger.debug('Updating Configurations: {}'.format(
+            reg.configurationId))
+        uow.configurations.update(reg)
         uow.commit()
 
 
@@ -82,7 +86,7 @@ def register_smo(uow, reg_data):
 @retry((ConnectionRefusedError), tries=2, delay=2)
 def call_smo(reg_data: dict):
     callback_data = json.dumps({
-        'consumerSubscriptionId': reg_data['registrationId'],
+        'consumerSubscriptionId': reg_data['configurationId'],
         'imsUrl': config.get_api_url()
     })
     logger.info('URL: {}, data: {}'.format(