Fix INF-328 and INF-373 the resource change and update issue

[pti/o2.git] / o2ims / views / alarm_dto.py

diff --git a/o2ims/views/alarm_dto.py b/o2ims/views/alarm_dto.py
index 6697f20..5d0bca5 100644 (file)
--- a/o2ims/views/alarm_dto.py
+++ b/o2ims/views/alarm_dto.py
@@ -14,6 +14,7 @@
 
 from flask_restx import fields
 
+from o2common.views.flask_restx_fields import Json2Dict
 from o2ims.views.api_ns import api_ims_monitoring as api_monitoring_v1
 
 
@@ -29,19 +30,21 @@ class AlarmDTO:
             'resourceTypeID': fields.String(attribute='resourceTypeId'),
             'resourceId': fields.String,
             'resourceID': fields.String(attribute='resourceId'),
-            'alarmEventRecordID':
-            fields.String(attribute='alarmEventRecordId'),
             'alarmDefinitionId': fields.String,
             'alarmDefinitionID': fields.String(attribute='alarmDefinitionId'),
             'probableCauseId': fields.String,
             'probableCauseID': fields.String(attribute='probableCauseId'),
             'alarmRaisedTime': fields.String,
-            'perceivedSeverity': fields.String,
             'alarmChangedTime': fields.String,
             'alarmAcknowledgeTime': fields.String,
             'alarmAcknowledged': fields.Boolean,
-            'extensions': fields.Raw(attribute='extensions'),
+            'perceivedSeverity': fields.String,
+            'extensions': Json2Dict(attribute='extensions')
         }
+        # mask='{alarmEventRecordId,resourceTypeID,resourceID,' +
+        # 'alarmDefinitionID,probableCauseID,' +
+        # 'alarmRaisedTime,perceivedSeverity,alarmChangedTime,' +
+        # 'alarmAcknowledgeTime,alarmAcknowledged,extensions}'
     )