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
Merge "Fix INF-359 and INF-352 about the alarm event record"
[pti/o2.git]
/
o2ims
/
views
/
alarm_dto.py
diff --git
a/o2ims/views/alarm_dto.py
b/o2ims/views/alarm_dto.py
index
54bfe7d
..
823268f
100644
(file)
--- a/
o2ims/views/alarm_dto.py
+++ b/
o2ims/views/alarm_dto.py
@@
-14,7
+14,7
@@
from flask_restx import fields
from flask_restx import fields
-from o2ims.views.api_ns import api_monitoring_v1
+from o2ims.views.api_ns import api_
ims_monitoring as api_
monitoring_v1
class AlarmDTO:
class AlarmDTO:
@@
-45,10
+45,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
+59,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'),
- }
- )