X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=holmes-actions%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fholmes%2Fcommon%2Fapi%2Fstat%2FVesAlarm.java;h=ae71ad434855d14d29df8e5dd637e111b47baf9f;hb=81304def362b19075438af781727e21ce8374bae;hp=3cdcb88e17a8edd8a87f68a81ca2623dab186ef2;hpb=f37f7595742b43c5bce7f4400184089ba1fb2d6c;p=holmes%2Fcommon.git

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/api/stat/VesAlarm.java b/holmes-actions/src/main/java/org/onap/holmes/common/api/stat/VesAlarm.java
index 3cdcb88..ae71ad4 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/api/stat/VesAlarm.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/api/stat/VesAlarm.java
@@ -27,9 +27,10 @@ import lombok.Setter;
 public class VesAlarm implements Cloneable, Serializable{
     private String domain;
     private String eventId;
-    private String EventName;
+    private String eventName;
     private String eventType;
-    private Object internalHeaderFields;
+    //Temporarily make it transient cuz no details of this field is provided and it is not used for now.
+    transient private Object internalHeaderFields;
     private Long lastEpochMicrosec;
     private String nfcNamingCode;
     private String nfNamingCode;
@@ -51,10 +52,13 @@ public class VesAlarm implements Cloneable, Serializable{
     private Long faultFieldsVersion;
     private String specificProblem;
     private String vfStatus;
+    private String parentId;
+    private int alarmIsCleared = 0;  //mark as 1 when alarm type is cleared, else mark as 0
+    private int rootFlag = 0;        // mark as 1 when alarm is a root alarm , else mark as 0
 
     @Override
     public int hashCode() {
-        return this.version.hashCode();
+        return (this.getSourceId() + this.eventName.replace("Cleared", "")).hashCode();
     }
 
     @Override
@@ -62,7 +66,9 @@ public class VesAlarm implements Cloneable, Serializable{
         if (object == null || !(object instanceof VesAlarm)) {
             return false;
         }
-        return this.version.equals(((VesAlarm) object).getVersion());
+        return this.eventName.replace("Cleared", "")
+                .equals(((VesAlarm) object).getEventName().replace("Cleared", ""))
+                && this.getSourceId().equals(((VesAlarm) object).getSourceId());
     }
 
     @Override
@@ -105,6 +111,8 @@ public class VesAlarm implements Cloneable, Serializable{
         vesAlarm.setFaultFieldsVersion(this.getFaultFieldsVersion());
         vesAlarm.setSpecificProblem(this.getSpecificProblem());
         vesAlarm.setVfStatus(this.vfStatus);
+        vesAlarm.setAlarmIsCleared(this.alarmIsCleared);
+        vesAlarm.setRootFlag(this.rootFlag);
 
         return vesAlarm;
     }