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 --- 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 ++- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'src/main/resources') 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]!}", -- cgit 1.2.3-korg