X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=o2ims%2Fdomain%2Falarm_obj.py;h=c0f9f1790766618e2f7e7308841a0d8c16fc147a;hb=HEAD;hp=cd653f89d7044b7c0b93ccbcb9ff0ed3f2a85716;hpb=748a90298e8abff7f1ff2fdec6a36c2775fe7161;p=pti%2Fo2.git

diff --git a/o2ims/domain/alarm_obj.py b/o2ims/domain/alarm_obj.py
index cd653f8..c0f9f17 100644
--- a/o2ims/domain/alarm_obj.py
+++ b/o2ims/domain/alarm_obj.py
@@ -45,8 +45,13 @@ class FaultGenericModel(AgRoot):
             # elif hasattr(api_response, 'event_log_id'):
             #     self.alarm_id = api_response.event_log_id
 
-            self.hash = content_hash if content_hash \
-                else str(hash((self.id, self.timestamp, self.status)))
+            self.hash = content_hash
+            if not self.hash:
+                if hasattr(api_response, 'filtered'):
+                    self.filtered = api_response.filtered
+                    self.hash = str(hash((self.id, str(self.filtered))))
+                else:
+                    self.hash = str(hash((self.id, self.updatetime)))
             self.content = json.dumps(api_response.to_dict())
             if EventTypeEnum.ALARM == type:
                 pass
@@ -98,7 +103,7 @@ class AlarmEventRecord(AgRoot, Serializer):
         self.alarmChangedTime = ''
         self.alarmAcknowledgeTime = ''
         self.alarmAcknowledged = False
-        self.extensions = []
+        self.extensions = ''
 
 
 class ProbableCause(AgRoot, Serializer):
@@ -120,6 +125,14 @@ class ClearingTypeEnum(str, Enum):
     MANUAL = 'MANUAL'
 
 
+class AlarmEventRecordModifications(AgRoot):
+    def __init__(self, ack: bool = None,
+                 clear: PerceivedSeverityEnum = None) -> None:
+        super().__init__()
+        self.alarmAcknowledged = ack
+        self.perceivedSeverity = clear
+
+
 class AlarmDefinition(AgRoot, Serializer):
     def __init__(self, id: str, name: str, change_type: AlarmChangeTypeEnum,
                  desc: str, prop_action: str, clearing_type: ClearingTypeEnum,
@@ -167,8 +180,8 @@ class AlarmEvent2SMO(Serializer):
     def __init__(self, eventtype: AlarmNotificationEventEnum,
                  id: str, ref: str, updatetime: str) -> None:
         self.notificationEventType = eventtype
-        self.objectRef = ref
         self.id = id
+        self.objectRef = ref
         self.updatetime = updatetime
 
 
@@ -205,4 +218,4 @@ class AlarmEventNotification(AgRoot, Serializer):
         self.alarmChangedTime = alarm.alarmChangedTime
         self.alarmAcknowledgeTime = alarm.alarmAcknowledgeTime
         self.alarmAcknowledged = alarm.alarmAcknowledged
-        self.extensions = []
+        self.extensions = alarm.extensions