diff options
| author |   k.kedron <k.kedron@partner.samsung.com> | 2021-09-16 17:08:30 +0200 |
|---|---|---|
| committer | Krystian Kedron <k.kedron@partner.samsung.com> | 2021-09-20 10:55:29 +0000 |
| commit | f1563a03cabc572d1cd15260befdaa8808048fbf (patch) | |
| tree | 11e08a9141b82b444957bff6dfdae6358daf3ed9 /src/main/java/org/onap/a1pesimulator/data | |
| parent | 5cdf20e8b9a1a3fef125b760591b934dfeeb2787 (diff) | |
Add support for reportingMethod
In GlobalVesConfiguration
Also update eventStructure endpoint
Issue-ID: INT-1945
Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com>
Change-Id: I49add658f9a70bcff3292e35ae76a68ce3ba5b77
Diffstat (limited to 'src/main/java/org/onap/a1pesimulator/data')
3 files changed, 7 insertions, 3 deletions
diff --git a/src/main/java/org/onap/a1pesimulator/data/ReportingMethodEnum.java b/src/main/java/org/onap/a1pesimulator/data/ReportingMethodEnum.java index f2a799b..f7bb52c 100644 --- a/src/main/java/org/onap/a1pesimulator/data/ReportingMethodEnum.java +++ b/src/main/java/org/onap/a1pesimulator/data/ReportingMethodEnum.java @@ -17,7 +17,7 @@ import lombok.Getter; @Getter public enum ReportingMethodEnum { - FILE_READY("File ready"), + FILE_READY("FILE_READY"), VES("VES"); public final String value; diff --git a/src/main/java/org/onap/a1pesimulator/data/fileready/RanPeriodicEvent.java b/src/main/java/org/onap/a1pesimulator/data/fileready/RanPeriodicEvent.java index 56d375e..364b368 100644 --- a/src/main/java/org/onap/a1pesimulator/data/fileready/RanPeriodicEvent.java +++ b/src/main/java/org/onap/a1pesimulator/data/fileready/RanPeriodicEvent.java @@ -13,6 +13,7 @@ package org.onap.a1pesimulator.data.fileready; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import java.util.concurrent.ScheduledFuture; import org.onap.a1pesimulator.data.ves.VesEvent; @@ -23,10 +24,12 @@ import lombok.Data; @Data @Builder +@JsonIgnoreProperties({ "scheduledFuture", "ranRunnable" }) public class RanPeriodicEvent { private VesEvent event; private Integer interval; + private String reportingMethod; private ScheduledFuture<?> scheduledFuture; private AbstractRanRunnable ranRunnable; } diff --git a/src/main/java/org/onap/a1pesimulator/data/ves/GlobalVesConfiguration.java b/src/main/java/org/onap/a1pesimulator/data/ves/GlobalVesConfiguration.java index 2d51a50..1186f84 100644 --- a/src/main/java/org/onap/a1pesimulator/data/ves/GlobalVesConfiguration.java +++ b/src/main/java/org/onap/a1pesimulator/data/ves/GlobalVesConfiguration.java @@ -20,6 +20,7 @@ import lombok.Getter; @AllArgsConstructor public class GlobalVesConfiguration { - private Integer interval; - private VesEvent event; + private final Integer interval; + private final VesEvent event; + private final String reportingMethod; } |