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
<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>
/*-
* ============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.
@XmlAttribute(name = "endTime", required = true)
@XmlSchemaType(name = "dateTime")
protected XMLGregorianCalendar endTime;
+ @XmlAttribute(name = "durationInSeconds", required = true)
+ protected int getDurationInSeconds() {
+ return duration.getSeconds();
+ }
}
<#--
============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.
<#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]!}",
<#--
============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.
<#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]!}",
<#--
============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.
<#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]!}",
major=1
minor=7
-patch=0
+patch=1
base_version=${major}.${minor}.${patch}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT