X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fviews%2Falarm_dto.py;h=5d0bca564d7ebefb848922730a3d259b9713835c;hb=ef929d2493f22367b2d514342a12b1686bda4413;hp=da95a553b78477fe90881d6cd4d369d2c5d1f3dd;hpb=a9840e41848cbbffcedf76f0a53ffc5d9bc87c01;p=pti%2Fo2.git

diff --git a/o2ims/views/alarm_dto.py b/o2ims/views/alarm_dto.py
index da95a55..5d0bca5 100644
--- 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
 
 
@@ -26,11 +27,24 @@ class AlarmDTO:
                 required=True,
                 description='Alarm Event Record ID'),
             'resourceTypeId': fields.String,
+            'resourceTypeID': fields.String(attribute='resourceTypeId'),
             'resourceId': fields.String,
+            'resourceID': fields.String(attribute='resourceId'),
             'alarmDefinitionId': fields.String,
+            'alarmDefinitionID': fields.String(attribute='alarmDefinitionId'),
+            'probableCauseId': fields.String,
+            'probableCauseID': fields.String(attribute='probableCauseId'),
             'alarmRaisedTime': fields.String,
+            'alarmChangedTime': fields.String,
+            'alarmAcknowledgeTime': fields.String,
+            'alarmAcknowledged': fields.Boolean,
             'perceivedSeverity': fields.String,
+            'extensions': Json2Dict(attribute='extensions')
         }
+        # mask='{alarmEventRecordId,resourceTypeID,resourceID,' +
+        # 'alarmDefinitionID,probableCauseID,' +
+        # 'alarmRaisedTime,perceivedSeverity,alarmChangedTime,' +
+        # 'alarmAcknowledgeTime,alarmAcknowledged,extensions}'
     )
 
 
@@ -45,10 +59,11 @@ class SubscriptionDTO:
             'callback': fields.String,
             'consumerSubscriptionId': fields.String,
             'filter': fields.String,
-        }
+        },
+        mask='{alarmSubscriptionId,callback}'
     )
 
-    subscription = api_monitoring_v1.model(
+    subscription_create = api_monitoring_v1.model(
         "AlarmSubscriptionCreateDto",
         {
             'callback': fields.String(
@@ -58,12 +73,3 @@ class SubscriptionDTO:
             'filter': fields.String,
         }
     )
-
-    subscription_post_resp = api_monitoring_v1.model(
-        "AlarmSubscriptionCreatedRespDto",
-        {
-            'alarmSubscriptionId': fields.String(
-                required=True,
-                description='Alarm Subscription ID'),
-        }
-    )