From 1f08f4c5771818f51f23c9eeff9a8d7a83783dc5 Mon Sep 17 00:00:00 2001 From: Stanislav Marszalek Date: Tue, 10 Aug 2021 10:09:05 +0200 Subject: PM Mapper output - granularityPeriod issue Issue-ID: DCAEGEN2-2873 Signed-off-by: Stanislav Marszalek Signed-off-by: Krystian Kedron Change-Id: I02d3684c98d563d7f386de2fdf032e930ac12b3f --- Changelog.md | 4 ++++ pom.xml | 2 +- .../services/pmmapper/model/measurement/common/MeasurementInfo.java | 5 +++++ src/main/resources/mapping.ftl | 3 ++- src/main/resources/templates/org.3GPP.28.532#measData | 3 ++- src/main/resources/templates/org.3GPP.32.435#measCollec | 3 ++- version.properties | 2 +- 7 files changed, 17 insertions(+), 5 deletions(-) diff --git a/Changelog.md b/Changelog.md index 66c35f0..20ba3d3 100644 --- a/Changelog.md +++ b/Changelog.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [1.7.1] +### Changed +- Fix granularityPeriod mapping + ## [1.7.0] - 29/07/2021 ### Changed - Update io.undertow:undertow-core to version 2.2.9.Final diff --git a/pom.xml b/pom.xml index 597bc0e..afbde12 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ org.onap.dcaegen2.services pm-mapper - 1.7.0-SNAPSHOT + 1.7.1-SNAPSHOT dcaegen2-services-pm-mapper diff --git a/src/main/java/org/onap/dcaegen2/services/pmmapper/model/measurement/common/MeasurementInfo.java b/src/main/java/org/onap/dcaegen2/services/pmmapper/model/measurement/common/MeasurementInfo.java index c6042b1..f667fdb 100644 --- a/src/main/java/org/onap/dcaegen2/services/pmmapper/model/measurement/common/MeasurementInfo.java +++ b/src/main/java/org/onap/dcaegen2/services/pmmapper/model/measurement/common/MeasurementInfo.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2020 Nordix Foundation. + * Copyright (C) 2021 Samsung Electronics. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -63,6 +64,10 @@ public class MeasurementInfo { @XmlAttribute(name = "endTime", required = true) @XmlSchemaType(name = "dateTime") protected XMLGregorianCalendar endTime; + @XmlAttribute(name = "durationInSeconds", required = true) + protected int getDurationInSeconds() { + return duration.getSeconds(); + } } diff --git a/src/main/resources/mapping.ftl b/src/main/resources/mapping.ftl index ca6fce8..4d3b9b7 100644 --- a/src/main/resources/mapping.ftl +++ b/src/main/resources/mapping.ftl @@ -2,6 +2,7 @@ <#-- ============LICENSE_START======================================================= Copyright (C) 2019 Nordix Foundation. + Copyright (C) 2021 Samsung Electronics. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -115,7 +116,7 @@ <#macro measDataCollection> { - "granularityPeriod": ${measData.measInfo.granPeriod.@endTime[0]!?datetime?long?c}, + "granularityPeriod": ${measData.measInfo.granPeriod.@durationInSeconds[0]!}, "measuredEntityUserName": "${measData.managedElement.@userLabel[0]!}", "measuredEntityDn": "${measData.managedElement.@localDn[0]!}", "measuredEntitySoftwareVersion": "${measData.managedElement.@swVersion[0]!}", diff --git a/src/main/resources/templates/org.3GPP.28.532#measData b/src/main/resources/templates/org.3GPP.28.532#measData index a845cc8..8f86a78 100644 --- a/src/main/resources/templates/org.3GPP.28.532#measData +++ b/src/main/resources/templates/org.3GPP.28.532#measData @@ -2,6 +2,7 @@ <#-- ============LICENSE_START======================================================= Copyright (C) 2019-2020 Nordix Foundation. + Copyright (C) 2021 Samsung Electronics. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -115,7 +116,7 @@ <#macro measDataCollection> { - "granularityPeriod": ${measData.measInfo.granPeriod.@endTime[0]!?datetime?long?c}, + "granularityPeriod": ${measData.measInfo.granPeriod.@durationInSeconds[0]!}, "measuredEntityUserName": "${measData.measEntity.@userLabel[0]!}", "measuredEntityDn": "${measData.measEntity.@localDn[0]!}", "measuredEntitySoftwareVersion": "${measData.measEntity.@swVersion[0]!}", diff --git a/src/main/resources/templates/org.3GPP.32.435#measCollec b/src/main/resources/templates/org.3GPP.32.435#measCollec index 422977e..98fdd80 100644 --- a/src/main/resources/templates/org.3GPP.32.435#measCollec +++ b/src/main/resources/templates/org.3GPP.32.435#measCollec @@ -2,6 +2,7 @@ <#-- ============LICENSE_START======================================================= Copyright (C) 2019-2020 Nordix Foundation. + Copyright (C) 2021 Samsung Electronics. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -115,7 +116,7 @@ <#macro measDataCollection> { - "granularityPeriod": ${measData.measInfo.granPeriod.@endTime[0]!?datetime?long?c}, + "granularityPeriod": ${measData.measInfo.granPeriod.@durationInSeconds[0]!}, "measuredEntityUserName": "${measData.managedElement.@userLabel[0]!}", "measuredEntityDn": "${measData.managedElement.@localDn[0]!}", "measuredEntitySoftwareVersion": "${measData.managedElement.@swVersion[0]!}", diff --git a/version.properties b/version.properties index 24828c2..cedaba1 100644 --- a/version.properties +++ b/version.properties @@ -1,6 +1,6 @@ major=1 minor=7 -patch=0 +patch=1 base_version=${major}.${minor}.${patch} release_version=${base_version} snapshot_version=${base_version}-SNAPSHOT -- cgit 1.2.3-korg