diff options
| -rw-r--r-- | Changelog.md | 5 | ||||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | releases/1.7.1-container.yaml | 9 | ||||
| -rw-r--r-- | src/main/java/org/onap/dcaegen2/services/pmmapper/model/measurement/common/MeasurementInfo.java | 5 | ||||
| -rw-r--r-- | src/main/resources/mapping.ftl | 3 | ||||
| -rw-r--r-- | src/main/resources/templates/org.3GPP.28.532#measData | 3 | ||||
| -rw-r--r-- | src/main/resources/templates/org.3GPP.32.435#measCollec | 3 | ||||
| -rw-r--r-- | version.properties | 2 |
8 files changed, 27 insertions, 5 deletions
diff --git a/Changelog.md b/Changelog.md index 66c35f0..a77b64d 100644 --- a/Changelog.md +++ b/Changelog.md @@ -4,6 +4,11 @@ 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] - 18/08/2021 +### Changed +- Add pm-mapper local development tools +- Fix granularityPeriod mapping + ## [1.7.0] - 29/07/2021 ### Changed - Update io.undertow:undertow-core to version 2.2.9.Final @@ -34,7 +34,7 @@ <groupId>org.onap.dcaegen2.services</groupId> <artifactId>pm-mapper</artifactId> - <version>1.7.0-SNAPSHOT</version> + <version>1.7.1-SNAPSHOT</version> <name>dcaegen2-services-pm-mapper</name> diff --git a/releases/1.7.1-container.yaml b/releases/1.7.1-container.yaml new file mode 100644 index 0000000..e34580d --- /dev/null +++ b/releases/1.7.1-container.yaml @@ -0,0 +1,9 @@ +distribution_type: 'container' +version: '1.7.1' +project: 'dcaegen2-services-pm-mapper' +log_dir: 'dcaegen2-services-pm-mapper-maven-docker-stage-master/780/' +containers: + - name: 'org.onap.dcaegen2.services.pm-mapper' + version: '1.7.1-20210818T145848ZZ' +container_release_tag: '1.7.1' +ref: '3fed8c65b87599dba92f4f878b026419f609f15a' 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 |