Fix INF-378 inventory subscription filter not take effect as expected

[pti/o2.git] / o2ims / service / auditor / agg_compute_handler.py

diff --git a/o2ims/service/auditor/agg_compute_handler.py b/o2ims/service/auditor/agg_compute_handler.py
index 807f40b..6c32986 100644 (file)
--- 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']
 
@@ -101,8 +107,7 @@ def create_by(stxobj: StxGenericModel, parentid: str, resourcetype_id: str) \
     gAssetId = ''  # TODO: global ID
     description = "%s : A Compute Aggregate server resource" % stxobj.name
     resource = Resource(stxobj.id, resourcetype_id, resourcepool_id,
-                        stxobj.name, parent_id, gAssetId, stxobj.content,
-                        description)
+                        parent_id, gAssetId, stxobj.content, description)
     resource.createtime = stxobj.createtime
     resource.updatetime = stxobj.updatetime
     resource.hash = stxobj.hash