X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fservice%2Fauditor%2Fagg_compute_handler.py;h=7bb8b158f0520f679ee8f0ce76e2da019fc7d615;hb=748a90298e8abff7f1ff2fdec6a36c2775fe7161;hp=807f40b1637b096e5d3258b5ff3f73b1c383ca5d;hpb=586f039c73d102429517cb6068de4342976e4e3f;p=pti%2Fo2.git diff --git a/o2ims/service/auditor/agg_compute_handler.py b/o2ims/service/auditor/agg_compute_handler.py index 807f40b..7bb8b15 100644 --- a/o2ims/service/auditor/agg_compute_handler.py +++ b/o2ims/service/auditor/agg_compute_handler.py @@ -42,7 +42,7 @@ def update_compute_aggregate( with uow: res = uow.session.execute( ''' - SELECT "resourceTypeId", "oCloudId", "name" + SELECT "resourceTypeId", "name" FROM "resourceType" WHERE "resourceTypeEnum" = :resource_type_enum ''', @@ -50,15 +50,21 @@ def update_compute_aggregate( ) first = res.first() if first is None: - resourcepool = uow.resource_pools.get(cmd.parentid) + # resourcepool = uow.resource_pools.get(cmd.parentid) res_type_name = 'compute_aggregate' 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='The compute Aggregate resource type')) + description='The compute Aggregate resource type') + 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']