X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fservice%2Fauditor%2Fpserver_mem_handler.py;h=2e0309b3f0347466915f4a938ca709a21dee792e;hb=26b17198615ace3334ebcfacbad9e08897e94826;hp=3ae40372eb68ee00027088c494a41a4207b075b4;hpb=9c887a3038703e7883450677f9d1ece4d40acd3d;p=pti%2Fo2.git

diff --git a/o2ims/service/auditor/pserver_mem_handler.py b/o2ims/service/auditor/pserver_mem_handler.py
index 3ae4037..2e0309b 100644
--- a/o2ims/service/auditor/pserver_mem_handler.py
+++ b/o2ims/service/auditor/pserver_mem_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_mem(
     cmd: commands.UpdatePserverMem,
     uow: AbstractUnitOfWork
@@ -39,11 +34,11 @@ def update_pserver_mem(
     stxobj = cmd.data
     with uow:
         p_resource = uow.resources.get(cmd.parentid)
-        resourcepool = uow.resource_pools.get(p_resource.resourcePoolId)
+        # resourcepool = uow.resource_pools.get(p_resource.resourcePoolId)
 
         res = uow.session.execute(
             '''
-            SELECT "resourceTypeId", "oCloudId", "name"
+            SELECT "resourceTypeId", "name"
             FROM "resourceType"
             WHERE "resourceTypeEnum" = :resource_type_enum
             ''',
@@ -54,11 +49,21 @@ def update_pserver_mem(
             res_type_name = 'pserver_mem'
             resourcetype_id = str(uuid.uuid3(
                 uuid.NAMESPACE_URL, res_type_name))
-            uow.resource_types.add(ResourceType(
+            res_type = ResourceType(
                 resourcetype_id,
                 res_type_name, stxobj.type,
-                resourcepool.oCloudId,
-                description='A Memory resource type of Physical Server'))
+                description='A Memory resource type of Physical Server')
+            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']
 
@@ -86,55 +91,3 @@ def update_pserver_mem(
             logger.info("Update the memory 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 memory resource of the physical server"\
-    #     % stxobj.name
-    content = json.loads(stxobj.content)
-    selected_keys = [
-        "memtotal_mib", "memavail_mib", "vm_hugepages_use_1G",
-        "vm_hugepages_possible_1G", "hugepages_configured",
-        "vm_hugepages_avail_1G", "vm_hugepages_nr_1G",
-        "vm_hugepages_nr_4K", "vm_hugepages_nr_2M",
-        "vm_hugepages_possible_2M", "vm_hugepages_avail_2M",
-        "platform_reserved_mib", "numa_node"
-        ]
-    filtered = dict(
-        filter(lambda item: item[0] in selected_keys, content.items()))
-    extensions = json.dumps(filtered)
-    description = ";".join([f"{k}:{v}" for k, v in filtered.items()])
-    resource = Resource(stxobj.id, resourcetype_id, resourcepool_id,
-                        stxobj.name, parent_id, gAssetId, stxobj.content,
-                        description, extensions)
-    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
-    ))