diff options
| author |   Mateusz Gołuchowski <mateusz.goluchowski@nokia.com> | 2020-07-16 11:00:00 +0200 |
|---|---|---|
| committer | Mateusz Gołuchowski <mateusz.goluchowski@nokia.com> | 2020-07-20 10:57:45 +0200 |
| commit | c62f765c1ed65829e126807e1e7a91388bb1c322 (patch) | |
| tree | 0bba7d7bd35e8ecdcb00047a0bae1a82e64f35ef /src/main/resources/templates | |
| parent | 977a518c680032572f6c5c59879ead71221e460a (diff) | |
Adjust pm-mapper to accept new schema.
- Replaced 28.550 schema and template with 28.532 standard
- Adjusted class for new schema
- Adjusted xml files for tests
- validate method will now throw exception when given fileFormatType is not supported
Issue-ID: DCAEGEN2-2308
Change-Id: I375db2004887f1f634adac31d4d1af3675f5911c
Signed-off-by: Mateusz Goluchowski <mateusz.goluchowski@nokia.com>
Diffstat (limited to 'src/main/resources/templates')
| -rw-r--r-- | src/main/resources/templates/org.3GPP.28.532#measData (renamed from src/main/resources/templates/org.3GPP.28.550#measData) | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/main/resources/templates/org.3GPP.28.550#measData b/src/main/resources/templates/org.3GPP.28.532#measData index 653077e..a845cc8 100644 --- a/src/main/resources/templates/org.3GPP.28.550#measData +++ b/src/main/resources/templates/org.3GPP.28.532#measData @@ -19,9 +19,9 @@ ============LICENSE_END========================================================= --> <#compress> -<#assign fileHeader = xml.MeasDataFile.fileHeader> -<#assign fileFooter = xml.MeasDataFile.fileFooter> -<#assign measData = xml.MeasDataFile.measData> +<#assign fileHeader = xml.measDataFile.fileHeader> +<#assign fileFooter = xml.measDataFile.fileFooter> +<#assign measData = xml.measDataFile.measData> <#setting datetime_format="iso"> { "event": { @@ -42,8 +42,8 @@ "sourceName": "${metadata.sourceName}", "reportingEntityName": "", "priority": "Normal", - "startEpochMicrosec": ${fileHeader.MeasData.@beginTime?datetime?long?c}, - "lastEpochMicrosec": ${fileFooter.MeasData.@endTime?datetime?long?c}, + "startEpochMicrosec": ${fileHeader.measData.@beginTime?datetime?long?c}, + "lastEpochMicrosec": ${fileFooter.measData.@endTime?datetime?long?c}, "version": "4.0", "vesEventListenerVersion": "7.1", "timeZoneOffset": "${metadata.timeZoneOffset}" @@ -116,9 +116,9 @@ <#macro measDataCollection> { "granularityPeriod": ${measData.measInfo.granPeriod.@endTime[0]!?datetime?long?c}, - "measuredEntityUserName": "${measData.measuredEntity.@userLabel[0]!}", - "measuredEntityDn": "${measData.measuredEntity.@localDn[0]!}", - "measuredEntitySoftwareVersion": "${measData.measuredEntity.@swVersion[0]!}", + "measuredEntityUserName": "${measData.measEntity.@userLabel[0]!}", + "measuredEntityDn": "${measData.measEntity.@localDn[0]!}", + "measuredEntitySoftwareVersion": "${measData.measEntity.@swVersion[0]!}", "measInfoList": <@measInfoList/> } </#macro> @@ -129,4 +129,4 @@ "measDataCollection": <@measDataCollection/> } </#macro> -</#compress>
\ No newline at end of file +</#compress> |