X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=inline;f=ves-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Fcommscope%2Ftr069adapter%2Fvesagent%2Fcontroller%2FAlarmMappingHandler.java;fp=ves-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Fcommscope%2Ftr069adapter%2Fvesagent%2Fcontroller%2FAlarmMappingHandler.java;h=9d099fde9901c9e6ad21980311bf803f3f154ab5;hb=641a6c47b4ee74412e9386b3c95693adda3cafc9;hp=02addc1d7cb1e599a4c278a39664351a807445ba;hpb=8c7432b8380a355e89df05f070e7d88e599912fd;p=oam%2Ftr069-adapter.git

diff --git a/ves-agent/src/main/java/org/commscope/tr069adapter/vesagent/controller/AlarmMappingHandler.java b/ves-agent/src/main/java/org/commscope/tr069adapter/vesagent/controller/AlarmMappingHandler.java
index 02addc1..9d099fd 100644
--- a/ves-agent/src/main/java/org/commscope/tr069adapter/vesagent/controller/AlarmMappingHandler.java
+++ b/ves-agent/src/main/java/org/commscope/tr069adapter/vesagent/controller/AlarmMappingHandler.java
@@ -42,6 +42,7 @@ import org.commscope.tr069adapter.vesagent.model.CommonEventHeader;
 import org.commscope.tr069adapter.vesagent.model.Event;
 import org.commscope.tr069adapter.vesagent.model.EventMessage;
 import org.commscope.tr069adapter.vesagent.model.FaultFields;
+import org.commscope.tr069adapter.vesagent.util.EventUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -117,18 +118,7 @@ public class AlarmMappingHandler {
       eventHeader.setTimeZoneOffset(extractTimeZoneOffSet(event.getAdditionalInformation()));
       eventHeader.setPriority(extractPriority(event.getPerceivedSeverity()));
 
-      if (eNodeBName == null) {
-        eventHeader.setReportingEntityName(notification.getDeviceDetails().getDeviceId());
-        eventHeader.setReportingEntityId(notification.getDeviceDetails().getDeviceId());
-        eventHeader.setSourceId(notification.getDeviceDetails().getDeviceId());
-        eventHeader.setSourceName(notification.getDeviceDetails().getDeviceId());
-      } else {
-        eventHeader.setReportingEntityName(eNodeBName);
-        eventHeader.setSourceName(eNodeBName);
-
-        eventHeader.setReportingEntityId(notification.getDeviceDetails().getDeviceId());
-        eventHeader.setSourceId(notification.getDeviceDetails().getDeviceId());
-      }
+      EventUtil.populateEnodeBName(eventHeader, notification, eNodeBName);
 
       eventHeader.setSequence(1);
       eventHeader.setStartEpochMicrosec(System.currentTimeMillis());