X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fservice%2Fauditor%2Fpserver_dev_handler.py;h=1e6b2f588c9a2fbef3970c447af2707db88e53b2;hb=26b17198615ace3334ebcfacbad9e08897e94826;hp=5b8ede8415bc7f4389d16667317e7655cc3e5b15;hpb=46d810e671d23449e36f1c5d78e5e725ff06a7ac;p=pti%2Fo2.git

diff --git a/o2ims/service/auditor/pserver_dev_handler.py b/o2ims/service/auditor/pserver_dev_handler.py
index 5b8ede8..1e6b2f5 100644
--- a/o2ims/service/auditor/pserver_dev_handler.py
+++ b/o2ims/service/auditor/pserver_dev_handler.py
@@ -15,23 +15,18 @@
 # pylint: disable=unused-argument
 from __future__ import annotations
 import uuid
-# import json
 
+from o2common.service.unit_of_work import AbstractUnitOfWork
 from o2ims.domain import commands, events
-from o2ims.domain.stx_object import StxGenericModel
+from o2ims.domain.ocloud import ResourceType
 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
+from o2ims.service.auditor.pserver_res_handler import is_outdated, \
+    create_by, update_by
 
 from o2common.helper import o2logging
 logger = o2logging.get_logger(__name__)
 
 
-class InvalidResourceType(Exception):
-    pass
-
-
 def update_pserver_dev(
     cmd: commands.UpdatePserverDev,
     uow: AbstractUnitOfWork
@@ -64,6 +59,10 @@ def update_pserver_dev(
             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']
@@ -92,41 +91,3 @@ def update_pserver_dev(
             logger.info("Update the device of pserver: " + stxobj.id
                         + ", name: " + stxobj.name)
         uow.commit()
-
-
-def is_outdated(resource: Resource, stxobj: StxGenericModel):
-    return True if resource.hash != stxobj.hash else False
-
-
-def create_by(stxobj: StxGenericModel, parent: Resource, resourcetype_id: str)\
-        -> Resource:
-    # content = json.loads(stxobj.content)
-    resourcetype_id = resourcetype_id
-    resourcepool_id = parent.resourcePoolId
-    parent_id = parent.resourceId
-    gAssetId = ''  # TODO: global ID
-    description = "%s : A device resource of the physical server"\
-        % stxobj.name
-    resource = Resource(stxobj.id, resourcetype_id, resourcepool_id,
-                        parent_id, gAssetId, stxobj.content, description)
-    resource.createtime = stxobj.createtime
-    resource.updatetime = stxobj.updatetime
-    resource.hash = stxobj.hash
-
-    return resource
-
-
-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.version_number = target.version_number + 1
-    target.events.append(events.ResourceChanged(
-        id=stxobj.id,
-        resourcePoolId=target.resourcePoolId,
-        notificationEventType=NotificationEventEnum.MODIFY,
-        updatetime=stxobj.updatetime
-    ))