Code Review
/
pti
/
o2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix INF-381 alarm watcher failed to audit alarm
[pti/o2.git]
/
o2ims
/
views
/
alarm_dto.py
diff --git
a/o2ims/views/alarm_dto.py
b/o2ims/views/alarm_dto.py
index
da95a55
..
dd90e75
100644
(file)
--- a/
o2ims/views/alarm_dto.py
+++ b/
o2ims/views/alarm_dto.py
@@
-26,11
+26,24
@@
class AlarmDTO:
required=True,
description='Alarm Event Record ID'),
'resourceTypeId': fields.String,
required=True,
description='Alarm Event Record ID'),
'resourceTypeId': fields.String,
+ 'resourceTypeID': fields.String(attribute='resourceTypeId'),
'resourceId': fields.String,
'resourceId': fields.String,
+ 'resourceID': fields.String(attribute='resourceId'),
'alarmDefinitionId': fields.String,
'alarmDefinitionId': fields.String,
+ 'alarmDefinitionID': fields.String(attribute='alarmDefinitionId'),
+ 'probableCauseId': fields.String,
+ 'probableCauseID': fields.String(attribute='probableCauseId'),
'alarmRaisedTime': fields.String,
'alarmRaisedTime': fields.String,
+ 'alarmChangedTime': fields.String,
+ 'alarmAcknowledgeTime': fields.String,
+ 'alarmAcknowledged': fields.Boolean,
'perceivedSeverity': fields.String,
'perceivedSeverity': fields.String,
+ 'extensions': fields.Raw(attribute='extensions'),
}
}
+ # mask='{alarmEventRecordId,resourceTypeID,resourceID,' +
+ # 'alarmDefinitionID,probableCauseID,' +
+ # 'alarmRaisedTime,perceivedSeverity,alarmChangedTime,' +
+ # 'alarmAcknowledgeTime,alarmAcknowledged,extensions}'
)
)
@@
-45,10
+58,11
@@
class SubscriptionDTO:
'callback': fields.String,
'consumerSubscriptionId': fields.String,
'filter': fields.String,
'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(
"AlarmSubscriptionCreateDto",
{
'callback': fields.String(
@@
-58,12
+72,3
@@
class SubscriptionDTO:
'filter': fields.String,
}
)
'filter': fields.String,
}
)
-
- subscription_post_resp = api_monitoring_v1.model(
- "AlarmSubscriptionCreatedRespDto",
- {
- 'alarmSubscriptionId': fields.String(
- required=True,
- description='Alarm Subscription ID'),
- }
- )