X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ves-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Fcommscope%2Ftr069adapter%2Fvesagent%2Fcontroller%2FPnfRegMappingHandler.java;h=25c7b69f114e38cd694ec71217ccd704927ccdd0;hb=c4ed11115cea02bb72770e74805081ddba12daef;hp=d449d0b6c6a24b3446c8c246e31a479021298613;hpb=a58ada8fd244e69cf2ebe48a251fcdd4d48acec4;p=oam%2Ftr069-adapter.git

diff --git a/ves-agent/src/main/java/org/commscope/tr069adapter/vesagent/controller/PnfRegMappingHandler.java b/ves-agent/src/main/java/org/commscope/tr069adapter/vesagent/controller/PnfRegMappingHandler.java
index d449d0b..25c7b69 100644
--- a/ves-agent/src/main/java/org/commscope/tr069adapter/vesagent/controller/PnfRegMappingHandler.java
+++ b/ves-agent/src/main/java/org/commscope/tr069adapter/vesagent/controller/PnfRegMappingHandler.java
@@ -36,6 +36,7 @@ import org.commscope.tr069adapter.vesagent.model.Event;
 import org.commscope.tr069adapter.vesagent.model.EventMessage;
 import org.commscope.tr069adapter.vesagent.model.PnfRegEventAdditionalFeilds;
 import org.commscope.tr069adapter.vesagent.model.PnfRegEventFields;
+import org.commscope.tr069adapter.vesagent.util.EventUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -109,30 +110,8 @@ public class PnfRegMappingHandler {
     eventHeader.setEventName("pnfReg_" + notification.getDeviceDetails().getProductClass() + "-"
         + config.getVendorName());
     eventHeader.setEventType(config.getPnfRegEventType());
-    eventHeader.setLastEpochMicrosec(System.currentTimeMillis());
-
     eventHeader.setPriority("High");
-    eventHeader.setSequence(0);
-
-    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());
-    }
-
-    eventHeader.setStartEpochMicrosec(System.currentTimeMillis());
-    eventHeader.setVersion(config.getEventVersion());
-    eventHeader.setNfNamingCode("");
-    eventHeader.setNfcNamingCode("");
-    eventHeader.setNfVendorName(config.getVendorName());
-    eventHeader.setVesEventListenerVersion(config.getVesVersion());
+    EventUtil.populateEventHeaderFields(eventHeader, notification, eNodeBName, config);
     regEvent.setCommonEventHeader(eventHeader);
 
     PnfRegEventFields pnfRegistrationFields =