X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fservice%2Fauditor%2Fpserver_if_handler.py;h=94602f753eca68aaaaf88acd044b4d411bcc7e1c;hb=a9840e41848cbbffcedf76f0a53ffc5d9bc87c01;hp=174f7097d030dad9c3cf2df40694dbbb0f2f6657;hpb=f73c8e3b01b8f5b7438ba544870e06d8f30cdea0;p=pti%2Fo2.git

diff --git a/o2ims/service/auditor/pserver_if_handler.py b/o2ims/service/auditor/pserver_if_handler.py
index 174f709..94602f7 100644
--- a/o2ims/service/auditor/pserver_if_handler.py
+++ b/o2ims/service/auditor/pserver_if_handler.py
@@ -17,11 +17,12 @@ from __future__ import annotations
 import uuid
 # import json
 
-from o2ims.domain import commands
+from o2ims.domain import commands, events
 from o2ims.domain.stx_object import StxGenericModel
 from o2common.service.unit_of_work import AbstractUnitOfWork
 from o2ims.domain.resource_type import MismatchedModel
 from o2ims.domain.ocloud import Resource, ResourceType
+from o2ims.domain.subscription_obj import NotificationEventEnum
 
 from o2common.helper import o2logging
 logger = o2logging.get_logger(__name__)
@@ -43,7 +44,7 @@ def update_pserver_if(
         res = uow.session.execute(
             '''
             SELECT "resourceTypeId", "oCloudId", "name"
-            FROM resourcetype
+            FROM "resourceType"
             WHERE "resourceTypeEnum" = :resource_type_enum
             ''',
             dict(resource_type_enum=stxobj.type.name)
@@ -95,9 +96,10 @@ def create_by(stxobj: StxGenericModel, parent: Resource, resourcetype_id: str)\
     resourcepool_id = parent.resourcePoolId
     parent_id = parent.resourceId
     gAssetId = ''  # TODO: global ID
-    description = "A interface resource of the physical server"
+    description = "An interface resource of the physical server"
     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
@@ -113,4 +115,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
+    ))