X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fservice%2Fauditor%2Fpserver_acc_handler.py;fp=o2ims%2Fservice%2Fauditor%2Fpserver_acc_handler.py;h=6c3ed51f09cb22afea7e38538ce95afacd75fb6b;hb=beb6be827aa4f45b8d798434a45bc15b0d7baf32;hp=c3c78ba66e0998ee32f8214849591426d1974aa0;hpb=4c7fe7c690292a2878792a9237f9a0c3be4ef901;p=pti%2Fo2.git diff --git a/o2ims/service/auditor/pserver_acc_handler.py b/o2ims/service/auditor/pserver_acc_handler.py index c3c78ba..6c3ed51 100644 --- a/o2ims/service/auditor/pserver_acc_handler.py +++ b/o2ims/service/auditor/pserver_acc_handler.py @@ -39,11 +39,11 @@ def update_pserver_acc( 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_acc( res_type_name = 'pserver_acc' 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='An Accelerator resource type of Physical Server')) + description='An Accelerator 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']