From 0b06291c6c0c6f8f1e8240c8c6b1175648a177aa Mon Sep 17 00:00:00 2001 From: Stanislav Marszalek Date: Fri, 9 Jul 2021 09:41:08 +0200 Subject: O1 PM Bulk support - collecting events, basic structure for PM Bulk File creation Issue-ID: INT-1945 Signed-off-by: Stanislav Marszalek Change-Id: If08908035719798d8d7b129ddcdb6ef62f1787fe --- .../org/onap/a1pesimulator/util/Constants.java | 4 +++ .../org/onap/a1pesimulator/util/Convertors.java | 33 ++++++++++++++++++++++ .../org/onap/a1pesimulator/util/RanVesUtils.java | 5 ++-- 3 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 src/main/java/org/onap/a1pesimulator/util/Convertors.java (limited to 'src/main/java/org/onap/a1pesimulator/util') diff --git a/src/main/java/org/onap/a1pesimulator/util/Constants.java b/src/main/java/org/onap/a1pesimulator/util/Constants.java index 1964efd..2af00b6 100644 --- a/src/main/java/org/onap/a1pesimulator/util/Constants.java +++ b/src/main/java/org/onap/a1pesimulator/util/Constants.java @@ -20,4 +20,8 @@ public class Constants { public static final String MEASUREMENT_FIELD_IDENTIFIER = "identifier"; public static final String MEASUREMENT_FIELD_VALUE = "value"; + public static final String FILE_READY_CHANGE_IDENTIFIER = "PM_MEAS_FILES"; + public static final String FILE_READY_CHANGE_TYPE = "FileReady"; + public static final String EMPTY_STRING = ""; + public static final String TEMP_DIR = System.getProperty("java.io.tmpdir"); } diff --git a/src/main/java/org/onap/a1pesimulator/util/Convertors.java b/src/main/java/org/onap/a1pesimulator/util/Convertors.java new file mode 100644 index 0000000..11e703f --- /dev/null +++ b/src/main/java/org/onap/a1pesimulator/util/Convertors.java @@ -0,0 +1,33 @@ +package org.onap.a1pesimulator.util; + +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; + +import lombok.experimental.UtilityClass; + +@UtilityClass +public class Convertors { + + public static final String YYYYMMDD_PATTERN = "yyyyMMdd"; + public static final String ISO_8601_DATE = "yyyy-MM-dd'T'HH:mm:ssZ"; + + public static String zonedDateTimeToString(ZonedDateTime localDateTime) { + DateTimeFormatter formatter = DateTimeFormatter.ofPattern(YYYYMMDD_PATTERN); + return zonedDateTimeToString(localDateTime, formatter); + } + + public static String zonedDateTimeToString(ZonedDateTime localDateTime, String pattern) { + DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern); + return zonedDateTimeToString(localDateTime, formatter); + } + + public static String zonedDateTimeToString(ZonedDateTime localDateTime, DateTimeFormatter formatter) { + return localDateTime.format(formatter); + } + + public static ZonedDateTime truncateToSpecifiedMinutes(ZonedDateTime zonedDateTime, Integer minutes) { + int minute = zonedDateTime.getMinute(); + int remainder = minute % minutes; + return remainder != 0 ? zonedDateTime.withMinute(minute - remainder) : zonedDateTime; + } +} diff --git a/src/main/java/org/onap/a1pesimulator/util/RanVesUtils.java b/src/main/java/org/onap/a1pesimulator/util/RanVesUtils.java index d5f3e67..a0f4991 100644 --- a/src/main/java/org/onap/a1pesimulator/util/RanVesUtils.java +++ b/src/main/java/org/onap/a1pesimulator/util/RanVesUtils.java @@ -23,9 +23,10 @@ import java.util.Map; import java.util.Random; import java.util.function.UnaryOperator; import java.util.stream.Collectors; + +import org.onap.a1pesimulator.data.Event; import org.onap.a1pesimulator.data.ue.UserEquipment; import org.onap.a1pesimulator.data.ves.CommonEventHeader; -import org.onap.a1pesimulator.data.ves.Event; import org.onap.a1pesimulator.data.ves.MeasurementFields.AdditionalMeasurement; import org.onap.a1pesimulator.service.ue.RanUeHolder; @@ -39,7 +40,7 @@ public class RanVesUtils { private static final String PATTERN_MARKER_START = "\\[\\["; private static final String PATTERN_MARKER_END = "\\]\\]"; - private static final String UE_PARAM_TRAFFIC_MODEL = "trafficModel"; + public static final String UE_PARAM_TRAFFIC_MODEL = "trafficModel"; private static final int TEN_MINUTES_MICROSECONDS = 10 * 60 * 1000_000; private static final Random random = new Random(); -- cgit 1.2.3-korg