4 files changed, 35 insertions, 7 deletions
diff --git a/src/main/java/org/onap/a1pesimulator/service/ves/RanVesBrokerService.java b/src/main/java/org/onap/a1pesimulator/service/ves/RanVesBrokerService.java
index 8767251..1b92fbf 100644
--- a/src/main/java/org/onap/a1pesimulator/service/ves/RanVesBrokerService.java
+++ b/src/main/java/org/onap/a1pesimulator/service/ves/RanVesBrokerService.java
@@ -32,7 +32,7 @@ public interface RanVesBrokerService {
 
     Collection<String> getEnabledEventElementIdentifiers();
 
-    VesEvent getEventStructure(String identifier);
+    RanPeriodicEvent getPeriodicEvent(String identifier);
 
     VesEvent startSendingFailureVesEvents(String identifier, ReportingMethodEnum reportingMethods);
 
@@ -43,4 +43,8 @@ public interface RanVesBrokerService {
     Integer getGlobalVesInterval();
 
     void setGlobalVesInterval(Integer interval);
+
+    String getGlobalReportingMethod();
+
+    void setGlobalReportingMethod(String reportingMethod);
 }
diff --git a/src/main/java/org/onap/a1pesimulator/service/ves/RanVesBrokerServiceImpl.java b/src/main/java/org/onap/a1pesimulator/service/ves/RanVesBrokerServiceImpl.java
index 4417212..ea4b46d 100644
--- a/src/main/java/org/onap/a1pesimulator/service/ves/RanVesBrokerServiceImpl.java
+++ b/src/main/java/org/onap/a1pesimulator/service/ves/RanVesBrokerServiceImpl.java
@@ -71,8 +71,8 @@ public class RanVesBrokerServiceImpl implements RanVesBrokerService {
     }
 
     @Override
-    public VesEvent getEventStructure(String identifier) {
-        return vesHolder.getEventStructure(identifier);
+    public RanPeriodicEvent getPeriodicEvent(String identifier) {
+        return vesHolder.getPeriodicEventForCell(identifier);
     }
 
     @Override
@@ -95,6 +95,16 @@ public class RanVesBrokerServiceImpl implements RanVesBrokerService {
         vesDataProvider.setInterval(interval);
     }
 
+    @Override
+    public String getGlobalReportingMethod() {
+        return vesDataProvider.getReportingMethod();
+    }
+
+    @Override
+    public void setGlobalReportingMethod(String reportingMethod) {
+        vesDataProvider.setReportingMethod(reportingMethod);
+    }
+
     private void enrichWithIdentifier(String identifier, VesEvent event) {
         if (event.getMeasurementFields() == null || event.getMeasurementFields().getAdditionalMeasurements() == null) {
             return;
diff --git a/src/main/java/org/onap/a1pesimulator/service/ves/RanVesDataProvider.java b/src/main/java/org/onap/a1pesimulator/service/ves/RanVesDataProvider.java
index 9a9a2f6..931b258 100644
--- a/src/main/java/org/onap/a1pesimulator/service/ves/RanVesDataProvider.java
+++ b/src/main/java/org/onap/a1pesimulator/service/ves/RanVesDataProvider.java
@@ -38,12 +38,18 @@ public class RanVesDataProvider {
     private VesEvent failurePmVesEvent;
     @Setter
     private Integer interval;
+    @Setter
+    private String reportingMethod;
 
     private final Integer defaultInterval;
+    private final String defaultReportingMethod;
     private final ResourceLoader resourceLoader;
 
-    public RanVesDataProvider(@Value("${ves.defaultInterval}") Integer defaultInterval, ResourceLoader resourceLoader) {
+    public RanVesDataProvider(@Value("${ves.defaultInterval}") Integer defaultInterval,
+            @Value("${ves.defaultReportingMethod}") String defaultReportingMethod,
+            ResourceLoader resourceLoader) {
         this.defaultInterval = defaultInterval;
+        this.defaultReportingMethod = defaultReportingMethod;
         this.resourceLoader = resourceLoader;
     }
 
@@ -66,6 +72,14 @@ public class RanVesDataProvider {
         return interval;
     }
 
+    public String getReportingMethod() {
+        if (reportingMethod == null) {
+            return defaultReportingMethod;
+        }
+
+        return reportingMethod;
+    }
+
     public Integer getFailureVesInterval() {
         return defaultInterval;
     }
diff --git a/src/main/java/org/onap/a1pesimulator/service/ves/RanVesHolder.java b/src/main/java/org/onap/a1pesimulator/service/ves/RanVesHolder.java
index c647811..92d30e4 100644
--- a/src/main/java/org/onap/a1pesimulator/service/ves/RanVesHolder.java
+++ b/src/main/java/org/onap/a1pesimulator/service/ves/RanVesHolder.java
@@ -156,12 +156,12 @@ public class RanVesHolder {
         return !periodicEventsCache.isEmpty();
     }
 
-    VesEvent getEventStructure(String identifier) {
+    RanPeriodicEvent getPeriodicEventForCell(String identifier) {
         if (!periodicEventsCache.containsKey(identifier)) {
             throw new IllegalArgumentException(
                     MessageFormat.format("Cannot find event for given source {0}", identifier));
         }
-        return periodicEventsCache.get(identifier).getEvent();
+        return periodicEventsCache.get(identifier);
     }
 
     private static class ThreadCacheUpdateFunction
@@ -203,7 +203,7 @@ public class RanVesHolder {
 
             ScheduledFuture<?> scheduledFuture =
                     vesPmThreadPoolTaskScheduler.scheduleAtFixedRate(ranRunnable, interval * 1000L);
-            return RanPeriodicEvent.builder().event(vesEvent).interval(interval).scheduledFuture(scheduledFuture)
+            return RanPeriodicEvent.builder().event(vesEvent).interval(interval).reportingMethod(reportingMethod.getValue()).scheduledFuture(scheduledFuture)
                     .ranRunnable(ranRunnable).build();
         }