X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fservice%2Fauditor%2Focloud_handler.py;h=d1e2fa77714735123eb2adfa9cd22d890cdda4e3;hb=a9840e41848cbbffcedf76f0a53ffc5d9bc87c01;hp=97cca3e880f723bde14f216d22ea3c76e8b5e6ec;hpb=9625c5b766377f641d9641471f10dd491a61447f;p=pti%2Fo2.git diff --git a/o2ims/service/auditor/ocloud_handler.py b/o2ims/service/auditor/ocloud_handler.py index 97cca3e..d1e2fa7 100644 --- a/o2ims/service/auditor/ocloud_handler.py +++ b/o2ims/service/auditor/ocloud_handler.py @@ -14,13 +14,13 @@ # pylint: disable=unused-argument from __future__ import annotations -from typing import Callable +# from typing import Callable # from dataclasses import asdict # from typing import List, Dict, Callable, Type # TYPE_CHECKING -from o2common.config import config +from o2common.config import config, conf # from o2common.service.messagebus import MessageBus from o2common.service.unit_of_work import AbstractUnitOfWork from o2ims.domain import events, commands @@ -41,8 +41,7 @@ class InvalidResourceType(Exception): def update_ocloud( cmd: commands.UpdateOCloud, - uow: AbstractUnitOfWork, - publish: Callable + uow: AbstractUnitOfWork ): stxobj = cmd.data with uow: @@ -82,14 +81,19 @@ def is_outdated(ocloud: Ocloud, stxobj: StxGenericModel): def create_by(stxobj: StxGenericModel) -> Ocloud: - imsendpoint = config.get_api_url() + config.get_o2ims_api_base() - globalcloudId = stxobj.id # to be updated + imsendpoint = config.get_api_url() + config.get_o2ims_api_base() + '/' + globalcloudId = conf.DEFAULT.ocloud_global_id description = "An ocloud" ocloud = Ocloud(stxobj.id, stxobj.name, imsendpoint, globalcloudId, description, 1) ocloud.createtime = stxobj.createtime ocloud.updatetime = stxobj.updatetime ocloud.hash = stxobj.hash + ocloud.events.append(events.OcloudChanged( + id=stxobj.id, + notificationEventType=NotificationEventEnum.CREATE, + updatetime=stxobj.updatetime + )) return ocloud