diff options
| author |   Tony Hansen <tony@att.com> | 2019-03-13 20:33:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-03-13 20:33:01 +0000 |
| commit | ccd0dc11d7ff162b14dfedd94d22efd86960e407 (patch) | |
| tree | c00cdcc4a7712c3a24d87b3b5ed6ad3b035775b7 /src/main | |
| parent | 290aa864c6a7d02a4f310c5d1cf8106e02e9dd47 (diff) | |
| parent | b49956cc49e34b83ffa8016c3ae026a2fad62c81 (diff) | |
Merge "Update mapping"
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/resources/mapping.ftl | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/main/resources/mapping.ftl b/src/main/resources/mapping.ftl index 0b35c54..2819de6 100644 --- a/src/main/resources/mapping.ftl +++ b/src/main/resources/mapping.ftl @@ -69,19 +69,20 @@ <#macro measValuesList measInfo> [ +<#list measInfo.measValue as measValue> { - "measObjInstId": "${measInfo.measValue.@measObjLdn[0]!}", - "suspectFlag": "${measInfo.measValue.suspect[0]! "false"}", + "measObjInstId": "${measValue.@measObjLdn[0]!}", + "suspectFlag": "${measValue.suspect[0]! "false"}", "measResults": [ - <#if measInfo.measValue.r?has_content> - <#list measInfo.measValue.r as r> + <#if measValue.r?has_content> + <#list measValue.r as r> { "p": ${r.@p}, "sValue": "${r}" }<#sep>,</#sep> </#list> <#else> - <#list measInfo.measValue.measResults?split(" ") as r> + <#list measValue.measResults?split(" ") as r> { "p":${r?index+1}, "sValue": "${r}" @@ -90,6 +91,8 @@ </#if> ] } +<#sep>,</#sep> +</#list> ] </#macro> @@ -114,7 +117,7 @@ "granularityPeriod": ${measData.measInfo.granPeriod.@endTime[0]!?datetime?long?c}, "measuredEntityUserName": "${measData.managedElement.@userLabel[0]!}", "measuredEntityDn": "${measData.managedElement.@localDn}", - "measuredEntitySoftwareVersion": "${measData.managedElement.@swVersion}", + "measuredEntitySoftwareVersion": "${measData.managedElement.@swVersion[0]!}", "measInfoList": <@measInfoList/> } </#macro> |