X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fservice%2Fcommand%2Fregistration_handler.py;h=a7978f546cd9a5d91d4b6687451503824824ef36;hb=6841e2e68f72068374d333723f5b5275bfb98933;hp=8531a2dcf9ef3f008aa640a6519ecfdfd6998f5a;hpb=250c3960b727b9549581b50b88849218ef951609;p=pti%2Fo2.git diff --git a/o2ims/service/command/registration_handler.py b/o2ims/service/command/registration_handler.py index 8531a2d..a7978f5 100644 --- a/o2ims/service/command/registration_handler.py +++ b/o2ims/service/command/registration_handler.py @@ -47,15 +47,7 @@ def registry_to_smo( logger.warning('Ocloud {} does not exists.'.format(data.id)) return logger.debug('O-Cloud Global UUID: {}'.format(ocloud.globalCloudId)) - # ocloud_dict = ocloud.serialize() - ocloud_dict = { - 'oCloudId': ocloud.oCloudId, - 'globalcloudId': ocloud.globalCloudId, - 'globalCloudId': ocloud.globalCloudId, - 'name': ocloud.name, - 'description': ocloud.description, - 'serviceUri': ocloud.serviceUri - } + ocloud_dict = ocloud.get_notification_dict() if data.notificationEventType == NotificationEventEnum.CREATE: register_smo(notifications, ocloud_dict) elif data.notificationEventType in [NotificationEventEnum.MODIFY, @@ -129,12 +121,12 @@ def call_smo(notifications: AbstractNotifications, reg_data: dict): 'smo_token_algo': 'RS256' } - callback_data = json.dumps({ + callback = { 'globalCloudId': reg_data['globalCloudId'], 'oCloudId': reg_data['oCloudId'], 'IMS_EP': config.get_api_url(), 'smo_token_data': smo_token_info - }) + } logger.info('callback URL: {}'.format(conf.DEFAULT.smo_register_url)) - logger.debug('callback data: {}'.format(callback_data)) - return notifications.send(conf.DEFAULT.smo_register_url, callback_data) + logger.debug('callback data: {}'.format(json.dumps(callback))) + return notifications.send(conf.DEFAULT.smo_register_url, callback)