diff options
| author |   JoeOLeary <joseph.o.leary@est.tech> | 2019-03-13 16:26:21 +0000 |
|---|---|---|
| committer | JoeOLeary <joseph.o.leary@est.tech> | 2019-03-13 16:26:21 +0000 |
| commit | b49956cc49e34b83ffa8016c3ae026a2fad62c81 (patch) | |
| tree | 12358c84a79d376f0db2a4c8bbb29d5e7d9be50d /src/main/resources | |
| parent | 88adbc830c24f309c19fc5874654cc1cfaebc600 (diff) | |
Update mapping
*Add support for multiple measvalue
*Fix failure when optional attribute swVersion missing
Issue-ID: DCAEGEN2-1038
Change-Id: I2408c0134a5d5bb2d90ad85ae2eac600fa89d52b
Signed-off-by: JoeOLeary <joseph.o.leary@est.tech>
Diffstat (limited to 'src/main/resources')
| -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> |