X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fservice%2Fauditor%2Fagg_storage_handler.py;fp=o2ims%2Fservice%2Fauditor%2Fagg_storage_handler.py;h=6fddf194aa470000e60ffef3bf4d2a304d377c95;hb=beb6be827aa4f45b8d798434a45bc15b0d7baf32;hp=14ee1520b5d9321d5d442115346ceca6adf04cae;hpb=4c7fe7c690292a2878792a9237f9a0c3be4ef901;p=pti%2Fo2.git

diff --git a/o2ims/service/auditor/agg_storage_handler.py b/o2ims/service/auditor/agg_storage_handler.py
index 14ee152..6fddf19 100644
--- a/o2ims/service/auditor/agg_storage_handler.py
+++ b/o2ims/service/auditor/agg_storage_handler.py
@@ -42,7 +42,7 @@ def update_storage_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_storage_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 = 'storage_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 storage Aggregate resource type'))
+                description='The storage 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']