diff options
| author |   gururajarao79 <gb00566633@techmahindra.com> | 2022-12-01 09:31:22 +0000 |
|---|---|---|
| committer |   Vijay Venkatesh Kumar <vv770d@att.com> | 2023-01-11 20:17:31 +0000 |
| commit | 2845424ec93223d2298bded1f60c8006e4acc8ae (patch) | |
| tree | 8e6af410c41478457df244765517934fc93f3ea1 /src | |
| parent | eba05a7b0eaae56250eac187693bc47a1cc3a241 (diff) | |
dcaegen2-services-pm-mapper incorrectly mapping the measResults
onap-gerrit-review: -capitalized-extension
Issue-ID: DCAEGEN2-3190
Signed-off-by: gururajarao79 <gb00566633@techmahindra.com>
Change-Id: I79376b9493bc38e20f6eb778241dc10de3aa920c
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/resources/templates/org.3GPP.28.532#measData | 7 | ||||
| -rw-r--r-- | src/main/resources/templates/org.3GPP.32.435#measCollec | 9 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/main/resources/templates/org.3GPP.28.532#measData b/src/main/resources/templates/org.3GPP.28.532#measData index 8f86a78..cfcbb46 100644 --- a/src/main/resources/templates/org.3GPP.28.532#measData +++ b/src/main/resources/templates/org.3GPP.28.532#measData @@ -3,6 +3,7 @@ ============LICENSE_START======================================================= Copyright (C) 2019-2020 Nordix Foundation. Copyright (C) 2021 Samsung Electronics. + Copyright (C) 2023 Deutsche Telekom AG. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -56,7 +57,7 @@ { "sMeasTypesList":[ <#if measInfo.measType?has_content> - <#list measInfo.measType as measType> + <#list measInfo.measType?sort_by("number(@p)") as measType> "${measType}"<#sep>,</#sep> </#list> <#else> @@ -77,9 +78,9 @@ "suspectFlag": "${measValue.suspect[0]! "false"}", "measResults": [ <#if measValue.r?has_content> - <#list measValue.r as r> + <#list measValue.r?sort_by("number(@p)") as r> { - "p": ${r.@p}, + "p": ${r?index+1}, "sValue": "${r}" }<#sep>,</#sep> </#list> diff --git a/src/main/resources/templates/org.3GPP.32.435#measCollec b/src/main/resources/templates/org.3GPP.32.435#measCollec index 98fdd80..3ea88df 100644 --- a/src/main/resources/templates/org.3GPP.32.435#measCollec +++ b/src/main/resources/templates/org.3GPP.32.435#measCollec @@ -3,6 +3,7 @@ ============LICENSE_START======================================================= Copyright (C) 2019-2020 Nordix Foundation. Copyright (C) 2021 Samsung Electronics. + Copyright (C) 2023 Deutsche Telekom AG. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -56,7 +57,7 @@ { "sMeasTypesList":[ <#if measInfo.measType?has_content> - <#list measInfo.measType as measType> + <#list measInfo.measType?sort_by("number(@p)") as measType> "${measType}"<#sep>,</#sep> </#list> <#else> @@ -77,9 +78,9 @@ "suspectFlag": "${measValue.suspect[0]! "false"}", "measResults": [ <#if measValue.r?has_content> - <#list measValue.r as r> + <#list measValue.r?sort_by("number(@p)") as r> { - "p": ${r.@p}, + "p": ${r?index+1}, "sValue": "${r}" }<#sep>,</#sep> </#list> @@ -131,4 +132,4 @@ "measDataCollection": <@measDataCollection/> } </#macro> -</#compress>
\ No newline at end of file +</#compress> |