diff options
Diffstat (limited to 'src/main')
4 files changed, 11 insertions, 3 deletions
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]!}", |