X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=o2ims%2Fservice%2Fauditor%2Fpserver_handler.py;h=f5df3814bfa468a50401f09785965716e0b7ce95;hb=9625c5b766377f641d9641471f10dd491a61447f;hp=f5f526ad8784832ce6b500b68989db58d06ff096;hpb=f73c8e3b01b8f5b7438ba544870e06d8f30cdea0;p=pti%2Fo2.git diff --git a/o2ims/service/auditor/pserver_handler.py b/o2ims/service/auditor/pserver_handler.py index f5f526a..f5df381 100644 --- a/o2ims/service/auditor/pserver_handler.py +++ b/o2ims/service/auditor/pserver_handler.py @@ -16,9 +16,11 @@ from __future__ import annotations import uuid # import json +from typing import Callable -from o2ims.domain import commands +from o2ims.domain import commands, events from o2ims.domain.stx_object import StxGenericModel +from o2ims.domain.subscription_obj import NotificationEventEnum from o2common.service.unit_of_work import AbstractUnitOfWork from o2ims.domain.resource_type import MismatchedModel from o2ims.domain.ocloud import Resource, ResourceType @@ -33,7 +35,8 @@ class InvalidResourceType(Exception): def update_pserver( cmd: commands.UpdatePserver, - uow: AbstractUnitOfWork + uow: AbstractUnitOfWork, + publish: Callable ): stxobj = cmd.data with uow: @@ -98,7 +101,8 @@ def create_by(stxobj: StxGenericModel, parentid: str, resourcetype_id: str) \ gAssetId = '' # TODO: global ID description = "A physical server resource" resource = Resource(stxobj.id, resourcetype_id, resourcepool_id, - parent_id, gAssetId, stxobj.content, description) + stxobj.name, parent_id, gAssetId, stxobj.content, + description) resource.createtime = stxobj.createtime resource.updatetime = stxobj.updatetime resource.hash = stxobj.hash @@ -114,4 +118,9 @@ def update_by(target: Resource, stxobj: StxGenericModel, target.updatetime = stxobj.updatetime target.hash = stxobj.hash target.version_number = target.version_number + 1 - target.events = [] + target.events.append(events.ResourceChanged( + id=stxobj.id, + resourcePoolId=target.resourcePoolId, + notificationEventType=NotificationEventEnum.MODIFY, + updatetime=stxobj.updatetime + ))