diff options
author | Stanislav Marszalek <s.marszalek2@partner.samsung.com> | 2021-07-16 08:24:29 +0200 |
---|---|---|
committer | Stanislav Marszalek <s.marszalek2@partner.samsung.com> | 2021-07-28 12:24:34 +0000 |
commit | 9a735bbccf18e984a9ae7c6bb81ee133ad911941 (patch) | |
tree | bb9b0e0c43ef31f95ef2768ca3249a7d51d4c828 /src/main/java/org/onap/a1pesimulator/service/fileready/PMBulkFileService.java | |
parent | cc41ed25adcd0d5a4714ac92eee387c41eacbd3e (diff) |
O1 PM Bulk support - Changes from testing against ONAP
Issue-ID: INT-1945
Signed-off-by: Stanislav Marszalek <s.marszalek2@partner.samsung.com>
Change-Id: I02d3684c98d563d7f386de2fdf032e930ac49b2f
Diffstat (limited to 'src/main/java/org/onap/a1pesimulator/service/fileready/PMBulkFileService.java')
-rw-r--r-- | src/main/java/org/onap/a1pesimulator/service/fileready/PMBulkFileService.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/main/java/org/onap/a1pesimulator/service/fileready/PMBulkFileService.java b/src/main/java/org/onap/a1pesimulator/service/fileready/PMBulkFileService.java index e628977..37b3440 100644 --- a/src/main/java/org/onap/a1pesimulator/service/fileready/PMBulkFileService.java +++ b/src/main/java/org/onap/a1pesimulator/service/fileready/PMBulkFileService.java @@ -70,6 +70,9 @@ public class PMBulkFileService { @Value("${xml.pm.bulk.userLabel}") private String userLabel; + @Value("${xml.pm.bulk.domainId}") + private String domainId; + public PMBulkFileService(VnfConfigReader vnfConfigReader) { this.vnfConfigReader = vnfConfigReader; } @@ -240,14 +243,15 @@ public class PMBulkFileService { * @param collectedEvents list of stored events * @return newly created File */ - private static File getXmlFile(List<EventMemoryHolder> collectedEvents) { - StringBuilder fileNameBuilder = new StringBuilder("D"); + private File getXmlFile(List<EventMemoryHolder> collectedEvents) { + StringBuilder fileNameBuilder = new StringBuilder("C"); ZonedDateTime firstEventTime = earliestEventTime(collectedEvents); ZonedDateTime lastEventTime = latestEventTime(collectedEvents); fileNameBuilder.append(zonedDateTimeToString(firstEventTime, YYYYMMDD_PATTERN)).append("."); fileNameBuilder.append(zonedDateTimeToString(truncateToSpecifiedMinutes(firstEventTime, 5), "HHmmZ")).append("-"); fileNameBuilder.append(zonedDateTimeToString(lastEventTime, YYYYMMDD_PATTERN)).append("."); fileNameBuilder.append(zonedDateTimeToString(truncateToSpecifiedMinutes(lastEventTime, 5), "HHmmZ")); + fileNameBuilder.append("_").append(domainId); fileNameBuilder.append(appendRcIfNecessary(fileNameBuilder)); fileNameBuilder.append(".xml"); @@ -270,6 +274,7 @@ public class PMBulkFileService { if (uniqueFileNamesWithCount.containsKey(fileName)) { sequence = uniqueFileNamesWithCount.get(fileName).incrementAndGet(); } else { + uniqueFileNamesWithCount.clear(); //we have new dates, so we can clear existing list to not grow infinitely uniqueFileNamesWithCount.put(fileName, new AtomicInteger(0)); } return sequence > 0 ? "_-_" + sequence : EMPTY_STRING; |