X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fservice%2Fauditor%2Fpserver_mem_handler.py;h=806d8d7c67a24ddc08748b9852878bbf1c5c50c8;hb=9c9fde8a0fd391b71753e51ae8b8bdd4531d79aa;hp=3ae40372eb68ee00027088c494a41a4207b075b4;hpb=e0e63509e5d7bf6195b8d7f40b44c75dce7e4306;p=pti%2Fo2.git diff --git a/o2ims/service/auditor/pserver_mem_handler.py b/o2ims/service/auditor/pserver_mem_handler.py index 3ae4037..806d8d7 100644 --- a/o2ims/service/auditor/pserver_mem_handler.py +++ b/o2ims/service/auditor/pserver_mem_handler.py @@ -39,11 +39,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 +54,17 @@ 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 + uow.resource_types.add(res_type) else: resourcetype_id = first['resourceTypeId']