Add api_versions support; update model of ocloud, resourcepool, and resource

[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..884f276 100644 (file)
--- 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:
@@ -44,7 +47,7 @@ def update_pserver(
         res = uow.session.execute(
             '''
             SELECT "resourceTypeId", "oCloudId", "name"
-            FROM resourcetype
+            FROM "resourceType"
             WHERE "resourceTypeEnum" = :resource_type_enum
             ''',
             dict(resource_type_enum=stxobj.type.name)
@@ -94,7 +97,7 @@ def create_by(stxobj: StxGenericModel, parentid: str, resourcetype_id: str) \
     # 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"
     resource = Resource(stxobj.id, resourcetype_id, resourcepool_id,
@@ -115,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
+    ))