X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fservice%2Fauditor%2Fpserver_handler.py;h=d5949eeac9551d7a0319b2ac88db2f230bfd9a16;hb=refs%2Fchanges%2F79%2F10279%2F1;hp=16ef26ff8ebb67ebc3e1934ca75c538271013bf7;hpb=748a90298e8abff7f1ff2fdec6a36c2775fe7161;p=pti%2Fo2.git

diff --git a/o2ims/service/auditor/pserver_handler.py b/o2ims/service/auditor/pserver_handler.py
index 16ef26f..d5949ee 100644
--- a/o2ims/service/auditor/pserver_handler.py
+++ b/o2ims/service/auditor/pserver_handler.py
@@ -15,7 +15,7 @@
 # pylint: disable=unused-argument
 from __future__ import annotations
 import uuid
-# import json
+import json
 from typing import Callable
 
 from o2ims.domain import commands, events
@@ -67,6 +67,10 @@ def update_pserver(
             alarm_dictionary = uow.alarm_dictionaries.get(dict_id)
             if alarm_dictionary:
                 res_type.alarmDictionary = alarm_dictionary
+            res_type.events.append(events.ResourceTypeChanged(
+                id=res_type.resourceTypeId,
+                notificationEventType=NotificationEventEnum.CREATE,
+                updatetime=stxobj.updatetime))
             uow.resource_types.add(res_type)
         else:
             resourcetype_id = first['resourceTypeId']
@@ -103,19 +107,26 @@ def is_outdated(resource: Resource, stxobj: StxGenericModel):
 
 def create_by(stxobj: StxGenericModel, parentid: str, resourcetype_id: str) \
         -> Resource:
-    # content = json.loads(stxobj.content)
     resourcetype_id = resourcetype_id
     resourcepool_id = parentid
     parent_id = None  # the root of the resource has no parent id
     gAssetId = ''  # TODO: global ID
-    description = "%s : A physical server resource" % stxobj.name
+    extensions = json.dumps(stxobj.filtered)
+    description = ";".join([f"{k}:{v}" for k, v in stxobj.filtered.items()])
     resource = Resource(stxobj.id, resourcetype_id, resourcepool_id,
-                        stxobj.name, parent_id, gAssetId, stxobj.content,
-                        description)
+                        parent_id, gAssetId, stxobj.content, description,
+                        extensions)
     resource.createtime = stxobj.createtime
     resource.updatetime = stxobj.updatetime
     resource.hash = stxobj.hash
 
+    resource.events.append(events.ResourceChanged(
+        id=stxobj.id,
+        resourcePoolId=resource.resourcePoolId,
+        notificationEventType=NotificationEventEnum.CREATE,
+        updatetime=stxobj.updatetime
+    ))
+
     return resource
 
 
@@ -123,9 +134,12 @@ def update_by(target: Resource, stxobj: StxGenericModel,
               parentid: str) -> None:
     if target.resourceId != stxobj.id:
         raise MismatchedModel("Mismatched Id")
-    target.createtime = stxobj.createtime
     target.updatetime = stxobj.updatetime
     target.hash = stxobj.hash
+    target.elements = stxobj.content
+    target.extensions = json.dumps(stxobj.filtered)
+    target.description = ";".join(
+        [f"{k}:{v}" for k, v in stxobj.filtered.items()])
     target.version_number = target.version_number + 1
     target.events.append(events.ResourceChanged(
         id=stxobj.id,