aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStanislav Marszalek <s.marszalek2@partner.samsung.com>2021-07-09 13:30:01 +0200
committerStanislav Marszalek <s.marszalek2@partner.samsung.com>2021-07-28 14:09:16 +0200
commit1599a5c6fed7698912a1968df24cf22d1a286222 (patch)
treef37eed21cdab40dff8689d516712d117e09f9a66
parent0b06291c6c0c6f8f1e8240c8c6b1175648a177aa (diff)
O1 PM Bulk support - PM Bulk XML File creation
Issue-ID: INT-1945 Signed-off-by: Stanislav Marszalek <s.marszalek2@partner.samsung.com> Change-Id: If08908035719798d8d7b129ddcdb6ef62f1747fe
-rw-r--r--src/main/java/org/onap/a1pesimulator/service/fileready/PMBulkFileService.java206
1 files changed, 204 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 980a653..e628977 100644
--- a/src/main/java/org/onap/a1pesimulator/service/fileready/PMBulkFileService.java
+++ b/src/main/java/org/onap/a1pesimulator/service/fileready/PMBulkFileService.java
@@ -3,10 +3,14 @@ package org.onap.a1pesimulator.service.fileready;
import static java.util.Comparator.comparing;
import static java.util.Objects.isNull;
import static org.onap.a1pesimulator.util.Constants.EMPTY_STRING;
+import static org.onap.a1pesimulator.util.Constants.MEASUREMENT_FIELD_IDENTIFIER;
+import static org.onap.a1pesimulator.util.Constants.MEASUREMENT_FIELD_VALUE;
import static org.onap.a1pesimulator.util.Constants.TEMP_DIR;
+import static org.onap.a1pesimulator.util.Convertors.ISO_8601_DATE;
import static org.onap.a1pesimulator.util.Convertors.YYYYMMDD_PATTERN;
import static org.onap.a1pesimulator.util.Convertors.truncateToSpecifiedMinutes;
import static org.onap.a1pesimulator.util.Convertors.zonedDateTimeToString;
+import static org.onap.a1pesimulator.util.RanVesUtils.UE_PARAM_TRAFFIC_MODEL;
import java.io.File;
import java.time.ZonedDateTime;
@@ -16,10 +20,30 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Stream;
+
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
import org.onap.a1pesimulator.data.fileready.EventMemoryHolder;
import org.onap.a1pesimulator.data.fileready.FileData;
+import org.onap.a1pesimulator.data.ves.VesEvent;
+import org.onap.a1pesimulator.util.VnfConfigReader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
import reactor.core.publisher.Mono;
@@ -30,7 +54,25 @@ import reactor.core.publisher.Mono;
@Service
public class PMBulkFileService {
+ private static final Logger log = LoggerFactory.getLogger(PMBulkFileService.class);
private static Map<String, AtomicInteger> uniqueFileNamesWithCount;
+ private final VnfConfigReader vnfConfigReader;
+
+ @Value("${xml.pm.bulk.fileFormatVersion}")
+ private String fileFormatVersion;
+
+ @Value("${xml.pm.bulk.vendorName}")
+ private String vendorName;
+
+ @Value("${xml.pm.bulk.fileSender}")
+ private String fileSenderValue;
+
+ @Value("${xml.pm.bulk.userLabel}")
+ private String userLabel;
+
+ public PMBulkFileService(VnfConfigReader vnfConfigReader) {
+ this.vnfConfigReader = vnfConfigReader;
+ }
/**
* Generate PM Bulk File xml from stored events
@@ -39,11 +81,161 @@ public class PMBulkFileService {
* @return generated file in Mono object
*/
public Mono<FileData> generatePMBulkFileXml(List<EventMemoryHolder> collectedEvents) {
- return Mono.just(FileData.builder().pmBulkFile(getXmlFile(collectedEvents)).build());
+
+ try {
+ DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+ docFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "");
+ docFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_SCHEMA, "");
+
+ DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
+
+ //root elements
+ Document doc = docBuilder.newDocument();
+
+ Element measCollecFile = doc.createElement("measCollecFile");
+ doc.appendChild(measCollecFile);
+ measCollecFile.setAttribute("xmlns", "http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec");
+ measCollecFile.setAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");
+ measCollecFile.setAttribute("xsi:schemaLocation",
+ "http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec");
+
+ //fileHeader elements
+ Element fileHeader = doc.createElement("fileHeader");
+ measCollecFile.appendChild(fileHeader);
+ fileHeader.setAttribute("fileFormatVersion", fileFormatVersion);
+ fileHeader.setAttribute("vendorName", vendorName);
+
+ //fileSender elements
+ Element fileSender = doc.createElement("fileSender");
+ fileHeader.appendChild(fileSender);
+ fileSender.setAttribute("elementType", fileSenderValue);
+
+ //measCollec elements
+ Element measCollec = doc.createElement("measCollec");
+ fileHeader.appendChild(measCollec);
+ measCollec.setAttribute("beginTime", zonedDateTimeToString(earliestEventTime(collectedEvents), ISO_8601_DATE));
+
+ //measData elements
+ Element measData = doc.createElement("measData");
+ measCollecFile.appendChild(measData);
+
+ //managedElement elements
+ Element managedElement = doc.createElement("managedElement");
+ measData.appendChild(managedElement);
+ managedElement.setAttribute("userLabel", userLabel);
+
+ //add measInfo elements
+ addMeansInfo(doc, measData, collectedEvents);
+
+ //fileFooter elements
+ Element fileFooter = doc.createElement("fileFooter");
+ measCollecFile.appendChild(fileFooter);
+
+ Element measCollecFooter = doc.createElement("measCollec");
+ fileFooter.appendChild(measCollecFooter);
+ measCollecFooter.setAttribute("endTime", zonedDateTimeToString(latestEventTime(collectedEvents), ISO_8601_DATE));
+
+ File xmlFile = writeDocumentIntoXmlFile(doc, collectedEvents);
+
+ log.trace("Removing all VES events from memory: {}", collectedEvents.size());
+ collectedEvents.clear();
+ return Mono.just(FileData.builder().pmBulkFile(xmlFile).build());
+
+ } catch (ParserConfigurationException | TransformerException pce) {
+ log.error("Error occurs while creating PM Bulk File", pce);
+ return Mono.empty();
+ }
}
/**
- * Generate PM Bulk File and its name. Example: D20050907.1030+0000-20050909.1500+0000_DomainId_-_2
+ * Add measurement elements for each cell and measurement time into PM Bulk File
+ *
+ * @param doc Document
+ * @param measData main element of document, which stores meansData
+ * @param collectedEvents list of stored events
+ */
+ private void addMeansInfo(Document doc, Element measData, List<EventMemoryHolder> collectedEvents) {
+ collectedEvents.stream().sorted(comparing(EventMemoryHolder::getEventDate)).forEach(eventMemoryHolder -> {
+ VesEvent event = eventMemoryHolder.getEvent();
+
+ Element measInfo = doc.createElement("measInfo");
+ measData.appendChild(measInfo);
+
+ //job element
+ Element job = doc.createElement("job");
+ measInfo.appendChild(job);
+ job.setAttribute("jobId", eventMemoryHolder.getJobId());
+
+ //granPeriod elements
+ Element granPeriod = doc.createElement("granPeriod");
+ measInfo.appendChild(granPeriod);
+ granPeriod.setAttribute("duration", getDurationString(eventMemoryHolder.getGranPeriod()));
+ ZonedDateTime endDate = eventMemoryHolder.getEventDate();
+ granPeriod.setAttribute("endTime", zonedDateTimeToString(endDate, ISO_8601_DATE));
+
+ //repPeriod elements
+ Element repPeriod = doc.createElement("repPeriod");
+ measInfo.appendChild(repPeriod);
+ repPeriod.setAttribute("duration", getDurationString(vnfConfigReader.getVnfConfig().getRepPeriod()));
+
+ //measType definition
+ HashMap<String, String> measurmentMap = new HashMap<>();
+ AtomicInteger i = new AtomicInteger(1);
+ event.getMeasurementFields().getAdditionalMeasurements().forEach(additionalMeasurement -> {
+ if (Stream.of(UE_PARAM_TRAFFIC_MODEL, MEASUREMENT_FIELD_IDENTIFIER)
+ .noneMatch(elementName -> elementName.equalsIgnoreCase(additionalMeasurement.getName()))) {
+ Element measType = doc.createElement("measType");
+ measInfo.appendChild(measType);
+ measType.setAttribute("p", String.valueOf(i));
+ measType.setTextContent(additionalMeasurement.getName());
+ measurmentMap.put(additionalMeasurement.getName(), String.valueOf(i));
+ i.incrementAndGet();
+ }
+ });
+
+ //measValue elements
+ Element measValue = doc.createElement("measValue");
+ measInfo.appendChild(measValue);
+ measValue.setAttribute("measObjLdn", eventMemoryHolder.getCellId());
+ event.getMeasurementFields().getAdditionalMeasurements().stream()
+ .filter(additionalMeasurement -> measurmentMap.containsKey(additionalMeasurement.getName())).forEach(additionalMeasurement -> {
+
+ //r elements
+ Element r = doc.createElement("r");
+ measValue.appendChild(r);
+ r.setAttribute("p", measurmentMap.get(additionalMeasurement.getName()));
+ r.setTextContent(additionalMeasurement.getHashMap().get(MEASUREMENT_FIELD_VALUE));
+ });
+ });
+ }
+
+ /**
+ * Converts Document into XML file and adds proper headers
+ *
+ * @param doc Document
+ * @param collectedEvents list of stored events
+ * @return newly created File in xml format
+ */
+ private File writeDocumentIntoXmlFile(Document doc, List<EventMemoryHolder> collectedEvents) throws TransformerException {
+ TransformerFactory transformerFactory = TransformerFactory.newInstance();
+ transformerFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "");
+ transformerFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, "");
+
+ Transformer tr = transformerFactory.newTransformer();
+ tr.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
+ tr.setOutputProperty(OutputKeys.VERSION, "1.0");
+ Node pi = doc.createProcessingInstruction("xml-stylesheet", "type=\"text/xsl\" href=\"MeasDataCollection.xsl\"");
+ doc.insertBefore(pi, doc.getDocumentElement());
+
+ File xmlFile = getXmlFile(collectedEvents);
+ StreamResult result = new StreamResult(xmlFile);
+ DOMSource source = new DOMSource(doc);
+ tr.transform(source, result);
+ return xmlFile;
+ }
+
+ /**
+ * Generate PM Bulk File and its name
*
* @param collectedEvents list of stored events
* @return newly created File
@@ -107,4 +299,14 @@ public class PMBulkFileService {
.max(comparing(ZonedDateTime::toEpochSecond, Comparator.nullsLast(Comparator.naturalOrder())))
.orElse(ZonedDateTime.now());
}
+
+ /**
+ * Convert duration interval in seconds to xml element required by the specification Examples: PT10S, PT900S
+ *
+ * @param interval interval in seconds
+ * @return duration xml element representation
+ */
+ private static String getDurationString(int interval) {
+ return "PT" + interval + "S";
+ }
}