Fix INF-328 and INF-373 the resource change and update issue

[pti/o2.git] / o2ims / service / auditor / pserver_handler.py

diff --git a/o2ims/service/auditor/pserver_handler.py b/o2ims/service/auditor/pserver_handler.py
index 63b0534..d5949ee 100644 (file)
--- a/o2ims/service/auditor/pserver_handler.py
+++ b/o2ims/service/auditor/pserver_handler.py
@@ -15,10 +15,12 @@
 # pylint: disable=unused-argument
 from __future__ import annotations
 import uuid
-# import json
+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,29 +35,43 @@ class InvalidResourceType(Exception):
 
 def update_pserver(
     cmd: commands.UpdatePserver,
-    uow: AbstractUnitOfWork
+    uow: AbstractUnitOfWork,
+    publish: Callable
 ):
     stxobj = cmd.data
     with uow:
-        resourcepool = uow.resource_pools.get(cmd.parentid)
+        # resourcepool = uow.resource_pools.get(cmd.parentid)
 
         # res = uow.session.execute(select(resourcetype).where(
         #     resourcetype.c.resourceTypeEnum == stxobj.type))
         res = uow.session.execute(
             '''
-            SELECT "resourceTypeId", "oCloudId", "name"
-            FROM resourcetype
+            SELECT "resourceTypeId", "name"
+            FROM "resourceType"
             WHERE "resourceTypeEnum" = :resource_type_enum
             ''',
             dict(resource_type_enum=stxobj.type.name)
         )
         first = res.first()
         if first is None:
-            resourcetype_id = str(uuid.uuid4())
-            uow.resource_types.add(ResourceType(
+            res_type_name = 'pserver'
+            resourcetype_id = str(uuid.uuid3(
+                uuid.NAMESPACE_URL, res_type_name))
+            res_type = ResourceType(
                 resourcetype_id,
-                'pserver', stxobj.type,
-                resourcepool.oCloudId))
+                res_type_name, stxobj.type,
+                description='The Physical Server resource type')
+            dict_id = str(uuid.uuid3(
+                uuid.NAMESPACE_URL,
+                str(f"{res_type_name}_alarmdictionary")))
+            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']
 
@@ -91,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 = parentid
+    parent_id = None  # the root of the resource has no parent id
     gAssetId = ''  # TODO: global ID
-    description = "A physical server resource"
+    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
 
 
@@ -111,8 +134,16 @@ 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 = []
+    target.events.append(events.ResourceChanged(
+        id=stxobj.id,
+        resourcePoolId=target.resourcePoolId,
+        notificationEventType=NotificationEventEnum.MODIFY,
+        updatetime=stxobj.updatetime
+    ))