VES Heartbeat and Software Management Feature

[oam/tr069-adapter.git] / ves-agent / src / main / java / org / commscope / tr069adapter / vesagent / controller / PnfRegMappingHandler.java

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 (file)
--- 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;\r
 import org.commscope.tr069adapter.vesagent.model.PnfRegEventAdditionalFeilds;\r
 import org.commscope.tr069adapter.vesagent.model.PnfRegEventFields;\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
@@ -109,30 +110,8 @@ public class PnfRegMappingHandler {
     eventHeader.setEventName("pnfReg_" + notification.getDeviceDetails().getProductClass() + "-"\r
         + config.getVendorName());\r
     eventHeader.setEventType(config.getPnfRegEventType());\r
-    eventHeader.setLastEpochMicrosec(System.currentTimeMillis());\r
-\r
     eventHeader.setPriority("High");\r
-    eventHeader.setSequence(0);\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
-\r
-    eventHeader.setStartEpochMicrosec(System.currentTimeMillis());\r
-    eventHeader.setVersion(config.getEventVersion());\r
-    eventHeader.setNfNamingCode("");\r
-    eventHeader.setNfcNamingCode("");\r
-    eventHeader.setNfVendorName(config.getVendorName());\r
-    eventHeader.setVesEventListenerVersion(config.getVesVersion());\r
+    EventUtil.populateEventHeaderFields(eventHeader, notification, eNodeBName, config);\r
     regEvent.setCommonEventHeader(eventHeader);\r
 \r
     PnfRegEventFields pnfRegistrationFields =\r