import org.commscope.tr069adapter.vesagent.model.Event;\r
import org.commscope.tr069adapter.vesagent.model.EventMessage;\r
import org.commscope.tr069adapter.vesagent.model.FaultFields;\r
+import org.commscope.tr069adapter.vesagent.util.EventUtil;\r
import org.slf4j.Logger;\r
import org.slf4j.LoggerFactory;\r
import org.springframework.beans.factory.annotation.Autowired;\r
eventHeader.setTimeZoneOffset(extractTimeZoneOffSet(event.getAdditionalInformation()));\r
eventHeader.setPriority(extractPriority(event.getPerceivedSeverity()));\r
\r
- if (eNodeBName == null) {\r
- eventHeader.setReportingEntityName(notification.getDeviceDetails().getDeviceId());\r
- eventHeader.setReportingEntityId(notification.getDeviceDetails().getDeviceId());\r
- eventHeader.setSourceId(notification.getDeviceDetails().getDeviceId());\r
- eventHeader.setSourceName(notification.getDeviceDetails().getDeviceId());\r
- } else {\r
- eventHeader.setReportingEntityName(eNodeBName);\r
- eventHeader.setSourceName(eNodeBName);\r
-\r
- eventHeader.setReportingEntityId(notification.getDeviceDetails().getDeviceId());\r
- eventHeader.setSourceId(notification.getDeviceDetails().getDeviceId());\r
- }\r
+ EventUtil.populateEnodeBName(eventHeader, notification, eNodeBName);\r
\r
eventHeader.setSequence(1);\r
eventHeader.setStartEpochMicrosec(System.currentTimeMillis());\r