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/test/resources/mapper_test | |
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/test/resources/mapper_test')
16 files changed, 74 insertions, 74 deletions
diff --git a/src/test/resources/mapper_test/CommonEventFormat_30.1-ONAP.json b/src/test/resources/mapper_test/CommonEventFormat_30.1-ONAP.json index 354fa68..dc39acc 100644 --- a/src/test/resources/mapper_test/CommonEventFormat_30.1-ONAP.json +++ b/src/test/resources/mapper_test/CommonEventFormat_30.1-ONAP.json @@ -1405,7 +1405,7 @@ "type": "object", "properties": { "formatVersion": { - "description": "3gpp PM reporting file format version from pre-standard TS 28.550 v2.0.0", + "description": "3gpp PM reporting file format version from pre-standard TS 28.532 v2.0.0", "type": "string" }, "granularityPeriod": { @@ -1423,15 +1423,15 @@ "items": { "type": "string" } }, "measuredEntityDn": { - "description": "distinguished name per 3GPP TS 28.550", + "description": "distinguished name per 3GPP TS 28.532", "type": "string" }, "measuredEntitySoftwareVersion": { - "description": "software version for the NF providing the PM data as specified in 3GPP TS 28.550", + "description": "software version for the NF providing the PM data as specified in 3GPP TS 28.532", "type": "string" }, "measuredEntityUserName": { - "description": "user definable name for the measured object per 3GPP TS 28.550", + "description": "user definable name for the measured object per 3GPP TS 28.532", "type": "string" } }, @@ -2178,7 +2178,7 @@ "required": [ "otherFieldsVersion" ] }, "perf3gppFields": { - "description": "fields for 3GPP PM format events, based on 3GPP TS 28.550, belonging to the 'perf3gpp' domain of the commonEventHeader domain enumeration", + "description": "fields for 3GPP PM format events, based on 3GPP TS 28.532, belonging to the 'perf3gpp' domain of the commonEventHeader domain enumeration", "type": "object", "properties": { "eventAddlFields": {"$ref": "#/definitions/hashMap"}, diff --git a/src/test/resources/mapper_test/mapping_data/28.550/meas_results/metadata.json b/src/test/resources/mapper_test/mapping_data/28.532/meas_results/metadata.json index 3456b7c..3d163e8 100644 --- a/src/test/resources/mapper_test/mapping_data/28.550/meas_results/metadata.json +++ b/src/test/resources/mapper_test/mapping_data/28.532/meas_results/metadata.json @@ -7,6 +7,6 @@ "timeZoneOffset": "UTC+05.00", "location": "ftpes://192.168.0.101:22/ftp/rop/A20161224.1045-1100.bin.gz", "compression": "gzip", - "fileFormatType": "org.3GPP.28.550#measData", + "fileFormatType": "org.3GPP.28.532#measData", "fileFormatVersion": "V9" }
\ No newline at end of file diff --git a/src/test/resources/mapper_test/mapping_data/28.550/meas_results/test.xml b/src/test/resources/mapper_test/mapping_data/28.532/meas_results/test.xml index 29747dc..d78c3ba 100644 --- a/src/test/resources/mapper_test/mapping_data/28.550/meas_results/test.xml +++ b/src/test/resources/mapper_test/mapping_data/28.532/meas_results/test.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<MeasDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.550#measData"> +<measDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.532#measData"> <fileHeader dnPrefix="some dnPrefix" vendorName="FooBar Ltd" - fileFormatVersion="28.550 V1"> + fileFormatVersion="28.532 V1"> <fileSender senderName="Dublin"/> - <MeasData beginTime="2018-10-02T12:00:00+01:00"/> + <measData beginTime="2018-10-02T12:00:00+01:00"/> </fileHeader> <measData> - <measuredEntity swVersion="r0.1" localDn="Dublin"/> + <measEntity swVersion="r0.1" localDn="Dublin"/> <measInfo measInfoId="some measInfoId"> <job jobId="jobId"/> <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/> @@ -19,6 +19,6 @@ </measInfo> </measData> <fileFooter> - <MeasData endTime="2018-10-02T12:15:00+01:00"/> + <measData endTime="2018-10-02T12:15:00+01:00"/> </fileFooter> -</MeasDataFile> +</measDataFile> diff --git a/src/test/resources/mapper_test/mapping_data/28.550/meas_type_and_r_many_meas_values/metadata.json b/src/test/resources/mapper_test/mapping_data/28.532/meas_type_and_r/metadata.json index 3456b7c..3d163e8 100644 --- a/src/test/resources/mapper_test/mapping_data/28.550/meas_type_and_r_many_meas_values/metadata.json +++ b/src/test/resources/mapper_test/mapping_data/28.532/meas_type_and_r/metadata.json @@ -7,6 +7,6 @@ "timeZoneOffset": "UTC+05.00", "location": "ftpes://192.168.0.101:22/ftp/rop/A20161224.1045-1100.bin.gz", "compression": "gzip", - "fileFormatType": "org.3GPP.28.550#measData", + "fileFormatType": "org.3GPP.28.532#measData", "fileFormatVersion": "V9" }
\ No newline at end of file diff --git a/src/test/resources/mapper_test/mapping_data/28.550/meas_type_and_r/test.xml b/src/test/resources/mapper_test/mapping_data/28.532/meas_type_and_r/test.xml index 1757f4a..42254bc 100644 --- a/src/test/resources/mapper_test/mapping_data/28.550/meas_type_and_r/test.xml +++ b/src/test/resources/mapper_test/mapping_data/28.532/meas_type_and_r/test.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<MeasDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.550#measData"> +<measDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.532#measData"> <fileHeader dnPrefix="some dnPrefix" vendorName="FooBar Ltd" - fileFormatVersion="28.550 V1"> + fileFormatVersion="28.532 V1"> <fileSender senderName="Dublin"/> - <MeasData beginTime="2018-10-02T12:00:00+01:00"/> + <measData beginTime="2018-10-02T12:00:00+01:00"/> </fileHeader> <measData> - <measuredEntity swVersion="r0.1" localDn="Dublin"/> + <measEntity swVersion="r0.1" localDn="Dublin"/> <measInfo measInfoId="some measInfoId"> <job jobId="some Job Id"/> <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/> @@ -23,6 +23,6 @@ </measInfo> </measData> <fileFooter> - <MeasData endTime="2018-10-02T12:15:00+01:00"/> + <measData endTime="2018-10-02T12:15:00+01:00"/> </fileFooter> -</MeasDataFile> +</measDataFile> diff --git a/src/test/resources/mapper_test/mapping_data/28.550/meas_type_and_r/metadata.json b/src/test/resources/mapper_test/mapping_data/28.532/meas_type_and_r_many_meas_values/metadata.json index 3456b7c..3d163e8 100644 --- a/src/test/resources/mapper_test/mapping_data/28.550/meas_type_and_r/metadata.json +++ b/src/test/resources/mapper_test/mapping_data/28.532/meas_type_and_r_many_meas_values/metadata.json @@ -7,6 +7,6 @@ "timeZoneOffset": "UTC+05.00", "location": "ftpes://192.168.0.101:22/ftp/rop/A20161224.1045-1100.bin.gz", "compression": "gzip", - "fileFormatType": "org.3GPP.28.550#measData", + "fileFormatType": "org.3GPP.28.532#measData", "fileFormatVersion": "V9" }
\ No newline at end of file diff --git a/src/test/resources/mapper_test/mapping_data/28.550/meas_type_and_r_many_meas_values/test.xml b/src/test/resources/mapper_test/mapping_data/28.532/meas_type_and_r_many_meas_values/test.xml index 3a0c608..893637c 100644 --- a/src/test/resources/mapper_test/mapping_data/28.550/meas_type_and_r_many_meas_values/test.xml +++ b/src/test/resources/mapper_test/mapping_data/28.532/meas_type_and_r_many_meas_values/test.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<MeasDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.550#measData"> +<measDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.532#measData"> <fileHeader dnPrefix="some dnPrefix" vendorName="FooBar Ltd" - fileFormatVersion="28.550 V1"> + fileFormatVersion="28.532 V1"> <fileSender senderName="Dublin"/> - <MeasData beginTime="2018-10-02T12:00:00+01:00"/> + <measData beginTime="2018-10-02T12:00:00+01:00"/> </fileHeader> <measData> - <measuredEntity swVersion="r0.1" localDn="Dublin"/> + <measEntity swVersion="r0.1" localDn="Dublin"/> <measInfo measInfoId="some measInfoId"> <job jobId="some Job Id"/> <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/> @@ -29,6 +29,6 @@ </measInfo> </measData> <fileFooter> - <MeasData endTime="2018-10-02T12:15:00+01:00"/> + <measData endTime="2018-10-02T12:15:00+01:00"/> </fileFooter> -</MeasDataFile> +</measDataFile> diff --git a/src/test/resources/mapper_test/mapping_data/28.550/meas_types_and_meas_results_many_meas_values/metadata.json b/src/test/resources/mapper_test/mapping_data/28.532/meas_types_and_meas_results_many_meas_values/metadata.json index 3456b7c..3d163e8 100644 --- a/src/test/resources/mapper_test/mapping_data/28.550/meas_types_and_meas_results_many_meas_values/metadata.json +++ b/src/test/resources/mapper_test/mapping_data/28.532/meas_types_and_meas_results_many_meas_values/metadata.json @@ -7,6 +7,6 @@ "timeZoneOffset": "UTC+05.00", "location": "ftpes://192.168.0.101:22/ftp/rop/A20161224.1045-1100.bin.gz", "compression": "gzip", - "fileFormatType": "org.3GPP.28.550#measData", + "fileFormatType": "org.3GPP.28.532#measData", "fileFormatVersion": "V9" }
\ No newline at end of file diff --git a/src/test/resources/mapper_test/mapping_data/28.550/meas_types_and_meas_results_many_meas_values/test.xml b/src/test/resources/mapper_test/mapping_data/28.532/meas_types_and_meas_results_many_meas_values/test.xml index 23f9429..3610f56 100644 --- a/src/test/resources/mapper_test/mapping_data/28.550/meas_types_and_meas_results_many_meas_values/test.xml +++ b/src/test/resources/mapper_test/mapping_data/28.532/meas_types_and_meas_results_many_meas_values/test.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<MeasDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.550#measData"> +<measDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.532#measData"> <fileHeader dnPrefix="some dnPrefix" vendorName="FooBar Ltd" - fileFormatVersion="28.550 V1"> + fileFormatVersion="28.532 V1"> <fileSender senderName="Dublin"/> - <MeasData beginTime="2018-10-02T12:00:00+01:00"/> + <measData beginTime="2018-10-02T12:00:00+01:00"/> </fileHeader> <measData> - <measuredEntity swVersion="r0.1" localDn="Dublin"/> + <measEntity swVersion="r0.1" localDn="Dublin"/> <measInfo measInfoId="some measInfoId"> <job jobId="jobId"/> <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/> @@ -23,6 +23,6 @@ </measInfo> </measData> <fileFooter> - <MeasData endTime="2018-10-02T12:15:00+01:00"/> + <measData endTime="2018-10-02T12:15:00+01:00"/> </fileFooter> -</MeasDataFile> +</measDataFile> diff --git a/src/test/resources/mapper_test/mapping_data/28.532/no_measdata/metadata.json b/src/test/resources/mapper_test/mapping_data/28.532/no_measdata/metadata.json new file mode 100644 index 0000000..3d163e8 --- /dev/null +++ b/src/test/resources/mapper_test/mapping_data/28.532/no_measdata/metadata.json @@ -0,0 +1,12 @@ +{ + "productName": "NrRadio", + "vendorName": "Ericsson", + "lastEpochMicrosec": "1538478000000", + "sourceName": "oteNB5309", + "startEpochMicrosec": "1538478900000", + "timeZoneOffset": "UTC+05.00", + "location": "ftpes://192.168.0.101:22/ftp/rop/A20161224.1045-1100.bin.gz", + "compression": "gzip", + "fileFormatType": "org.3GPP.28.532#measData", + "fileFormatVersion": "V9" +}
\ No newline at end of file diff --git a/src/test/resources/mapper_test/mapping_data/28.532/no_measdata/test.xml b/src/test/resources/mapper_test/mapping_data/28.532/no_measdata/test.xml new file mode 100644 index 0000000..de1d952 --- /dev/null +++ b/src/test/resources/mapper_test/mapping_data/28.532/no_measdata/test.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<measDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.532#measData"> + <fileHeader dnPrefix="some dnPrefix" vendorName="FooBar Ltd" + fileFormatVersion="28.532 V1"> + <fileSender senderName="Dublin"/> + <measData beginTime="2018-10-02T12:00:00+01:00"/> + </fileHeader> + <fileFooter> + <measData endTime="2018-10-02T12:15:00+01:00"/> + </fileFooter> +</measDataFile> diff --git a/src/test/resources/mapper_test/mapping_data/28.532/no_sw_version/metadata.json b/src/test/resources/mapper_test/mapping_data/28.532/no_sw_version/metadata.json new file mode 100644 index 0000000..3d163e8 --- /dev/null +++ b/src/test/resources/mapper_test/mapping_data/28.532/no_sw_version/metadata.json @@ -0,0 +1,12 @@ +{ + "productName": "NrRadio", + "vendorName": "Ericsson", + "lastEpochMicrosec": "1538478000000", + "sourceName": "oteNB5309", + "startEpochMicrosec": "1538478900000", + "timeZoneOffset": "UTC+05.00", + "location": "ftpes://192.168.0.101:22/ftp/rop/A20161224.1045-1100.bin.gz", + "compression": "gzip", + "fileFormatType": "org.3GPP.28.532#measData", + "fileFormatVersion": "V9" +}
\ No newline at end of file diff --git a/src/test/resources/mapper_test/mapping_data/28.550/no_sw_version/test.xml b/src/test/resources/mapper_test/mapping_data/28.532/no_sw_version/test.xml index 92fd1ff..5ab3796 100644 --- a/src/test/resources/mapper_test/mapping_data/28.550/no_sw_version/test.xml +++ b/src/test/resources/mapper_test/mapping_data/28.532/no_sw_version/test.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<MeasDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.550#measData"> +<measDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.532#measData"> <fileHeader dnPrefix="some dnPrefix" vendorName="FooBar Ltd" - fileFormatVersion="28.550 V1"> + fileFormatVersion="28.532 V1"> <fileSender senderName="Dublin"/> - <MeasData beginTime="2018-10-02T12:00:00+01:00"/> + <measData beginTime="2018-10-02T12:00:00+01:00"/> </fileHeader> <measData> - <measuredEntity localDn="Dublin"/> + <measEntity localDn="Dublin"/> <measInfo measInfoId="some measInfoId"> <job jobId="some Job Id"/> <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/> @@ -23,6 +23,6 @@ </measInfo> </measData> <fileFooter> - <MeasData endTime="2018-10-02T12:15:00+01:00"/> + <measData endTime="2018-10-02T12:15:00+01:00"/> </fileFooter> -</MeasDataFile> +</measDataFile> diff --git a/src/test/resources/mapper_test/mapping_data/28.550/no_measdata/metadata.json b/src/test/resources/mapper_test/mapping_data/28.550/no_measdata/metadata.json deleted file mode 100644 index 3456b7c..0000000 --- a/src/test/resources/mapper_test/mapping_data/28.550/no_measdata/metadata.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "productName": "NrRadio", - "vendorName": "Ericsson", - "lastEpochMicrosec": "1538478000000", - "sourceName": "oteNB5309", - "startEpochMicrosec": "1538478900000", - "timeZoneOffset": "UTC+05.00", - "location": "ftpes://192.168.0.101:22/ftp/rop/A20161224.1045-1100.bin.gz", - "compression": "gzip", - "fileFormatType": "org.3GPP.28.550#measData", - "fileFormatVersion": "V9" -}
\ No newline at end of file diff --git a/src/test/resources/mapper_test/mapping_data/28.550/no_measdata/test.xml b/src/test/resources/mapper_test/mapping_data/28.550/no_measdata/test.xml deleted file mode 100644 index 30bb82b..0000000 --- a/src/test/resources/mapper_test/mapping_data/28.550/no_measdata/test.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<MeasDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.550#measData"> - <fileHeader dnPrefix="some dnPrefix" vendorName="FooBar Ltd" - fileFormatVersion="28.550 V1"> - <fileSender senderName="Dublin"/> - <MeasData beginTime="2018-10-02T12:00:00+01:00"/> - </fileHeader> - <fileFooter> - <MeasData endTime="2018-10-02T12:15:00+01:00"/> - </fileFooter> -</MeasDataFile> diff --git a/src/test/resources/mapper_test/mapping_data/28.550/no_sw_version/metadata.json b/src/test/resources/mapper_test/mapping_data/28.550/no_sw_version/metadata.json deleted file mode 100644 index 3456b7c..0000000 --- a/src/test/resources/mapper_test/mapping_data/28.550/no_sw_version/metadata.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "productName": "NrRadio", - "vendorName": "Ericsson", - "lastEpochMicrosec": "1538478000000", - "sourceName": "oteNB5309", - "startEpochMicrosec": "1538478900000", - "timeZoneOffset": "UTC+05.00", - "location": "ftpes://192.168.0.101:22/ftp/rop/A20161224.1045-1100.bin.gz", - "compression": "gzip", - "fileFormatType": "org.3GPP.28.550#measData", - "fileFormatVersion": "V9" -}
\ No newline at end of file |