diff options
Diffstat (limited to 'src/test/resources')
34 files changed, 172 insertions, 149 deletions
diff --git a/src/test/resources/filter_test/nr/meas_results/expected.xml b/src/test/resources/filter_test/nr/meas_results/expected.xml index 834b54a..73b371d 100644 --- a/src/test/resources/filter_test/nr/meas_results/expected.xml +++ b/src/test/resources/filter_test/nr/meas_results/expected.xml @@ -1,10 +1,10 @@ -<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 fileFormatVersion="32.435 V10.0" vendorName="FooBar Ltd" dnPrefix="some dnPrefix"> <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" swVersion="r0.1"/> + <measEntity localDn="Dublin" swVersion="r0.1"/> <measInfo measInfoId="some measInfoId"> <job jobId="jobId"/> <granPeriod duration="PT900S" endTime="2018-10-02T12:15:00Z"/> @@ -17,6 +17,6 @@ </measInfo> </measData> <fileFooter> - <MeasData endTime="2018-10-02T12:15:00+01:00"/> + <measData endTime="2018-10-02T12:15:00+01:00"/> </fileFooter> -</MeasDataFile>
\ No newline at end of file +</measDataFile>
\ No newline at end of file diff --git a/src/test/resources/filter_test/nr/meas_results/test.xml b/src/test/resources/filter_test/nr/meas_results/test.xml index 0b84ff6..606fab2 100644 --- a/src/test/resources/filter_test/nr/meas_results/test.xml +++ b/src/test/resources/filter_test/nr/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="32.435 V10.0"> <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/filter_test/nr/meas_results_manyinfo/expected.xml b/src/test/resources/filter_test/nr/meas_results_manyinfo/expected.xml index 1f9cfbf..23007d6 100644 --- a/src/test/resources/filter_test/nr/meas_results_manyinfo/expected.xml +++ b/src/test/resources/filter_test/nr/meas_results_manyinfo/expected.xml @@ -1,10 +1,10 @@ -<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 fileFormatVersion="32.435 V10.0" vendorName="FooBar Ltd" dnPrefix="some dnPrefix"> <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" swVersion="r0.1"/> + <measEntity localDn="Dublin" swVersion="r0.1"/> <measInfo measInfoId="some measInfoId"> <job jobId="jobId"/> <granPeriod duration="PT900S" endTime="2018-10-02T12:15:00Z"/> @@ -27,6 +27,6 @@ </measInfo> </measData> <fileFooter> - <MeasData endTime="2018-10-02T12:15:00+01:00"/> + <measData endTime="2018-10-02T12:15:00+01:00"/> </fileFooter> -</MeasDataFile>
\ No newline at end of file +</measDataFile>
\ No newline at end of file diff --git a/src/test/resources/filter_test/nr/meas_results_manyinfo/test.xml b/src/test/resources/filter_test/nr/meas_results_manyinfo/test.xml index 217d339..e5efbee 100644 --- a/src/test/resources/filter_test/nr/meas_results_manyinfo/test.xml +++ b/src/test/resources/filter_test/nr/meas_results_manyinfo/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="32.435 V10.0"> <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="this will be filtered out"> <job jobId="jobId"/> <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/> @@ -39,6 +39,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/filter_test/nr/meas_type_and_r/expected.xml b/src/test/resources/filter_test/nr/meas_type_and_r/expected.xml index 74090c6..cc3f22d 100644 --- a/src/test/resources/filter_test/nr/meas_type_and_r/expected.xml +++ b/src/test/resources/filter_test/nr/meas_type_and_r/expected.xml @@ -1,10 +1,10 @@ -<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 fileFormatVersion="32.435 V10.0" vendorName="FooBar Ltd" dnPrefix="some dnPrefix">
<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" swVersion="r0.1"/>
+ <measEntity localDn="Dublin" swVersion="r0.1"/>
<measInfo measInfoId="some measInfoId">
<job jobId="jobId"/>
<granPeriod duration="PT900S" endTime="2018-10-02T12:15:00Z"/>
@@ -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>
\ No newline at end of file +</measDataFile>
\ No newline at end of file diff --git a/src/test/resources/filter_test/nr/meas_type_and_r/test.xml b/src/test/resources/filter_test/nr/meas_type_and_r/test.xml index e55d303..4e032e3 100644 --- a/src/test/resources/filter_test/nr/meas_type_and_r/test.xml +++ b/src/test/resources/filter_test/nr/meas_type_and_r/test.xml @@ -1,10 +1,10 @@ -<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 fileFormatVersion="32.435 V10.0" vendorName="FooBar Ltd" dnPrefix="some dnPrefix">
<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" swVersion="r0.1"/>
+ <measEntity localDn="Dublin" swVersion="r0.1"/>
<measInfo measInfoId="some measInfoId">
<job jobId="jobId"/>
<granPeriod duration="PT900S" endTime="2018-10-02T12:15:00Z"/>
@@ -21,6 +21,6 @@ </measInfo>
</measData>
<fileFooter>
- <MeasData endTime="2018-10-02T12:15:00+01:00"/>
+ <measData endTime="2018-10-02T12:15:00+01:00"/>
</fileFooter>
-</MeasDataFile>
\ No newline at end of file +</measDataFile>
\ No newline at end of file diff --git a/src/test/resources/filter_test/nr/meas_type_and_r_many_measvalue/expected.xml b/src/test/resources/filter_test/nr/meas_type_and_r_many_measvalue/expected.xml index afc8e6f..e844dd0 100644 --- a/src/test/resources/filter_test/nr/meas_type_and_r_many_measvalue/expected.xml +++ b/src/test/resources/filter_test/nr/meas_type_and_r_many_measvalue/expected.xml @@ -1,10 +1,10 @@ -<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 fileFormatVersion="32.435 V10.0" vendorName="FooBar Ltd" dnPrefix="some dnPrefix">
<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" swVersion="r0.1"/>
+ <measEntity localDn="Dublin" swVersion="r0.1"/>
<measInfo measInfoId="some measInfoId">
<job jobId="jobId"/>
<granPeriod duration="PT900S" endTime="2018-10-02T12:15:00Z"/>
@@ -25,6 +25,6 @@ </measInfo>
</measData>
<fileFooter>
- <MeasData endTime="2018-10-02T12:15:00+01:00"/>
+ <measData endTime="2018-10-02T12:15:00+01:00"/>
</fileFooter>
-</MeasDataFile>
\ No newline at end of file +</measDataFile>
\ No newline at end of file diff --git a/src/test/resources/filter_test/nr/meas_type_and_r_many_measvalue/test.xml b/src/test/resources/filter_test/nr/meas_type_and_r_many_measvalue/test.xml index f268ca2..127ed70 100644 --- a/src/test/resources/filter_test/nr/meas_type_and_r_many_measvalue/test.xml +++ b/src/test/resources/filter_test/nr/meas_type_and_r_many_measvalue/test.xml @@ -1,10 +1,10 @@ -<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 fileFormatVersion="32.435 V10.0" vendorName="FooBar Ltd" dnPrefix="some dnPrefix">
<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" swVersion="r0.1"/>
+ <measEntity localDn="Dublin" swVersion="r0.1"/>
<measInfo measInfoId="some measInfoId">
<job jobId="jobId"/>
<granPeriod duration="PT900S" endTime="2018-10-02T12:15:00Z"/>
@@ -31,6 +31,6 @@ </measInfo>
</measData>
<fileFooter>
- <MeasData endTime="2018-10-02T12:15:00+01:00"/>
+ <measData endTime="2018-10-02T12:15:00+01:00"/>
</fileFooter>
-</MeasDataFile>
\ No newline at end of file +</measDataFile>
\ No newline at end of file diff --git a/src/test/resources/filter_test/nr/meas_type_and_r_manyinfo/expected.xml b/src/test/resources/filter_test/nr/meas_type_and_r_manyinfo/expected.xml index 03c42ab..b5f9982 100644 --- a/src/test/resources/filter_test/nr/meas_type_and_r_manyinfo/expected.xml +++ b/src/test/resources/filter_test/nr/meas_type_and_r_manyinfo/expected.xml @@ -1,10 +1,10 @@ -<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 fileFormatVersion="32.435 V10.0" vendorName="FooBar Ltd" dnPrefix="some dnPrefix">
<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" swVersion="r0.1"/>
+ <measEntity localDn="Dublin" swVersion="r0.1"/>
<measInfo measInfoId="some measInfoId">
<job jobId="jobId"/>
<granPeriod duration="PT900S" endTime="2018-10-02T12:15:00Z"/>
@@ -31,6 +31,6 @@ </measInfo>
</measData>
<fileFooter>
- <MeasData endTime="2018-10-02T12:15:00+01:00"/>
+ <measData endTime="2018-10-02T12:15:00+01:00"/>
</fileFooter>
-</MeasDataFile>
\ No newline at end of file +</measDataFile>
\ No newline at end of file diff --git a/src/test/resources/filter_test/nr/meas_type_and_r_manyinfo/test.xml b/src/test/resources/filter_test/nr/meas_type_and_r_manyinfo/test.xml index beda93f..2137c65 100644 --- a/src/test/resources/filter_test/nr/meas_type_and_r_manyinfo/test.xml +++ b/src/test/resources/filter_test/nr/meas_type_and_r_manyinfo/test.xml @@ -1,10 +1,10 @@ -<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 fileFormatVersion="32.435 V10.0" vendorName="FooBar Ltd" dnPrefix="some dnPrefix">
<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" swVersion="r0.1"/>
+ <measEntity localDn="Dublin" swVersion="r0.1"/>
<measInfo measInfoId="some measInfoId">
<job jobId="jobId"/>
<granPeriod duration="PT900S" endTime="2018-10-02T12:15:00Z"/>
@@ -49,6 +49,6 @@ </measInfo>
</measData>
<fileFooter>
- <MeasData endTime="2018-10-02T12:15:00+01:00"/>
+ <measData endTime="2018-10-02T12:15:00+01:00"/>
</fileFooter>
-</MeasDataFile>
\ No newline at end of file +</measDataFile>
\ No newline at end of file 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 diff --git a/src/test/resources/metadata/valid_5g_metadata.json b/src/test/resources/metadata/valid_5g_metadata.json index 3456b7c..3d163e8 100644 --- a/src/test/resources/metadata/valid_5g_metadata.json +++ b/src/test/resources/metadata/valid_5g_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/split_test/nr/type_a_1_event/test.xml b/src/test/resources/split_test/nr/type_a_1_event/test.xml index f88e0c5..f55c67d 100644 --- a/src/test/resources/split_test/nr/type_a_1_event/test.xml +++ b/src/test/resources/split_test/nr/type_a_1_event/test.xml @@ -1,11 +1,11 @@ -<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="32.435 V10.0"> <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="Singular measInfoId"> <job jobId="jobId"/> <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/> @@ -18,6 +18,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/split_test/nr/type_c_3_events/test.xml b/src/test/resources/split_test/nr/type_c_3_events/test.xml index ccbb09b..e8b9c43 100644 --- a/src/test/resources/split_test/nr/type_c_3_events/test.xml +++ b/src/test/resources/split_test/nr/type_c_3_events/test.xml @@ -1,11 +1,11 @@ -<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="32.435 V10.0"> <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="Dublin1"/> + <measEntity swVersion="r0.1" localDn="Dublin1"/> <measInfo measInfoId="First measInfoId"> <job jobId="jobId1"/> <granPeriod endTime="2001-10-02T12:15:00Z" duration="PT100S"/> @@ -18,7 +18,7 @@ </measInfo> </measData> <measData> - <measuredEntity swVersion="r0.2" localDn="Dublin2"/> + <measEntity swVersion="r0.2" localDn="Dublin2"/> <measInfo measInfoId="Second measInfoId"> <job jobId="jobId"/> <granPeriod endTime="2002-10-02T12:15:00Z" duration="PT200S"/> @@ -31,7 +31,7 @@ </measInfo> </measData> <measData> - <measuredEntity swVersion="r0.3" localDn="Dublin3"/> + <measEntity swVersion="r0.3" localDn="Dublin3"/> <measInfo measInfoId="Third measInfoId"> <job jobId="jobId"/> <granPeriod endTime="2003-10-02T12:15:00Z" duration="PT300S"/> @@ -44,6 +44,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/xml_validator_test/test_data/not_supported_type/no_file_header/test.xml b/src/test/resources/xml_validator_test/test_data/not_supported_type/no_file_header/test.xml new file mode 100644 index 0000000..b5f85de --- /dev/null +++ b/src/test/resources/xml_validator_test/test_data/not_supported_type/no_file_header/test.xml @@ -0,0 +1,22 @@ +<measDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec"> + <measData> + <measEntity swVersion="r0.1" localDn="Dublin"/> + <measInfo measInfoId="some meas info id"> + <job jobId="some jobId"/> + <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/> + <repPeriod duration="PT900S"/> + <measType p="1">a</measType> + <measType p="2">b</measType> + <measType p="3">c</measType> + <measValue measObjLdn="some measObjLdn"> + <r p="1">86</r> + <r p="2">67</r> + <r p="3">14</r> + <suspect>false</suspect> + </measValue> + </measInfo> + </measData> + <fileFooter> + <measData endTime="2018-10-02T12:15:00+01:00"/> + </fileFooter> +</measDataFile> diff --git a/src/test/resources/xml_validator_test/test_data/not_supported_type/no_file_header/validity.props b/src/test/resources/xml_validator_test/test_data/not_supported_type/no_file_header/validity.props new file mode 100644 index 0000000..80da24e --- /dev/null +++ b/src/test/resources/xml_validator_test/test_data/not_supported_type/no_file_header/validity.props @@ -0,0 +1 @@ +valid=false
\ No newline at end of file diff --git a/src/test/resources/xml_validator_test/test_data/nr/no_file_header/test.xml b/src/test/resources/xml_validator_test/test_data/nr/no_file_header/test.xml index 3450b98..73ce2b3 100644 --- a/src/test/resources/xml_validator_test/test_data/nr/no_file_header/test.xml +++ b/src/test/resources/xml_validator_test/test_data/nr/no_file_header/test.xml @@ -1,6 +1,6 @@ -<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"> <measData> - <measuredEntity swVersion="r0.1" localDn="Dublin"/> + <measEntity swVersion="r0.1" localDn="Dublin"/> <measInfo measInfoId="some meas info id"> <job jobId="some jobId"/> <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/> @@ -17,6 +17,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/xml_validator_test/test_data/nr/no_measdata/test.xml b/src/test/resources/xml_validator_test/test_data/nr/no_measdata/test.xml index fb141ad..b8a31eb 100644 --- a/src/test/resources/xml_validator_test/test_data/nr/no_measdata/test.xml +++ b/src/test/resources/xml_validator_test/test_data/nr/no_measdata/test.xml @@ -1,10 +1,10 @@ -<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="32.435 V10.0"> <fileSender senderName="Dublin"/> - <MeasData beginTime="2018-10-02T12:00:00+01:00"/> + <measData beginTime="2018-10-02T12:00:00+01:00"/> </fileHeader> <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/xml_validator_test/test_data/nr/no_measured_entity/test.xml b/src/test/resources/xml_validator_test/test_data/nr/no_measured_entity/test.xml index 0d4216e..aace7dc 100644 --- a/src/test/resources/xml_validator_test/test_data/nr/no_measured_entity/test.xml +++ b/src/test/resources/xml_validator_test/test_data/nr/no_measured_entity/test.xml @@ -1,9 +1,9 @@ <?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="32.435 V10.0"> <fileSender senderName="Dublin"/> - <MeasData beginTime="2018-10-02T12:00:00+01:00"/> + <measData beginTime="2018-10-02T12:00:00+01:00"/> </fileHeader> <measData> <measInfo measInfoId="some measInfoId"> @@ -22,6 +22,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> |