Adjust pm-mapper to accept new schema. 41/110241/6
authorMateusz Gołuchowski <mateusz.goluchowski@nokia.com>
Thu, 16 Jul 2020 09:00:00 +0000 (11:00 +0200)
committerMateusz Gołuchowski <mateusz.goluchowski@nokia.com>
Mon, 20 Jul 2020 08:57:45 +0000 (10:57 +0200)
commitc62f765c1ed65829e126807e1e7a91388bb1c322
tree0bba7d7bd35e8ecdcb00047a0bae1a82e64f35ef
parent977a518c680032572f6c5c59879ead71221e460a
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>
46 files changed:
src/main/java/org/onap/dcaegen2/services/pmmapper/exceptions/NotSupportedFormatTypeException.java [new file with mode: 0644]
src/main/java/org/onap/dcaegen2/services/pmmapper/model/measurement/nr/MeasDataFile.java
src/main/java/org/onap/dcaegen2/services/pmmapper/utils/MeasConverter.java
src/main/java/org/onap/dcaegen2/services/pmmapper/utils/XMLValidator.java
src/main/resources/schemas/org.3GPP.28.532#measData [moved from src/main/resources/schemas/org.3GPP.28.550#measData with 85% similarity]
src/main/resources/templates/org.3GPP.28.532#measData [moved from src/main/resources/templates/org.3GPP.28.550#measData with 86% similarity]
src/test/java/org/onap/dcaegen2/services/pmmapper/filtering/MeasFilterHandlerTest.java
src/test/java/org/onap/dcaegen2/services/pmmapper/filtering/MetadataFilterTest.java
src/test/java/org/onap/dcaegen2/services/pmmapper/mapping/MapperTest.java
src/test/java/org/onap/dcaegen2/services/pmmapper/utils/MeasSplitterTest.java
src/test/java/org/onap/dcaegen2/services/pmmapper/utils/XMLValidatorTest.java
src/test/java/utils/EventUtils.java
src/test/resources/filter_test/nr/meas_results/expected.xml
src/test/resources/filter_test/nr/meas_results/test.xml
src/test/resources/filter_test/nr/meas_results_manyinfo/expected.xml
src/test/resources/filter_test/nr/meas_results_manyinfo/test.xml
src/test/resources/filter_test/nr/meas_type_and_r/expected.xml
src/test/resources/filter_test/nr/meas_type_and_r/test.xml
src/test/resources/filter_test/nr/meas_type_and_r_many_measvalue/expected.xml
src/test/resources/filter_test/nr/meas_type_and_r_many_measvalue/test.xml
src/test/resources/filter_test/nr/meas_type_and_r_manyinfo/expected.xml
src/test/resources/filter_test/nr/meas_type_and_r_manyinfo/test.xml
src/test/resources/mapper_test/CommonEventFormat_30.1-ONAP.json
src/test/resources/mapper_test/mapping_data/28.532/meas_results/metadata.json [moved from src/test/resources/mapper_test/mapping_data/28.550/meas_type_and_r/metadata.json with 87% similarity]
src/test/resources/mapper_test/mapping_data/28.532/meas_results/test.xml [moved from src/test/resources/mapper_test/mapping_data/28.550/meas_results/test.xml with 66% similarity]
src/test/resources/mapper_test/mapping_data/28.532/meas_type_and_r/metadata.json [moved from src/test/resources/mapper_test/mapping_data/28.550/meas_type_and_r_many_meas_values/metadata.json with 87% similarity]
src/test/resources/mapper_test/mapping_data/28.532/meas_type_and_r/test.xml [moved from src/test/resources/mapper_test/mapping_data/28.550/meas_type_and_r/test.xml with 70% similarity]
src/test/resources/mapper_test/mapping_data/28.532/meas_type_and_r_many_meas_values/metadata.json [moved from src/test/resources/mapper_test/mapping_data/28.550/meas_results/metadata.json with 87% similarity]
src/test/resources/mapper_test/mapping_data/28.532/meas_type_and_r_many_meas_values/test.xml [moved from src/test/resources/mapper_test/mapping_data/28.550/meas_type_and_r_many_meas_values/test.xml with 75% similarity]
src/test/resources/mapper_test/mapping_data/28.532/meas_types_and_meas_results_many_meas_values/metadata.json [moved from src/test/resources/mapper_test/mapping_data/28.550/meas_types_and_meas_results_many_meas_values/metadata.json with 87% similarity]
src/test/resources/mapper_test/mapping_data/28.532/meas_types_and_meas_results_many_meas_values/test.xml [moved from src/test/resources/mapper_test/mapping_data/28.550/meas_types_and_meas_results_many_meas_values/test.xml with 71% similarity]
src/test/resources/mapper_test/mapping_data/28.532/no_measdata/metadata.json [new file with mode: 0644]
src/test/resources/mapper_test/mapping_data/28.532/no_measdata/test.xml [new file with mode: 0644]
src/test/resources/mapper_test/mapping_data/28.532/no_sw_version/metadata.json [new file with mode: 0644]
src/test/resources/mapper_test/mapping_data/28.532/no_sw_version/test.xml [moved from src/test/resources/mapper_test/mapping_data/28.550/no_sw_version/test.xml with 72% similarity]
src/test/resources/mapper_test/mapping_data/28.550/no_measdata/metadata.json [deleted file]
src/test/resources/mapper_test/mapping_data/28.550/no_measdata/test.xml [deleted file]
src/test/resources/mapper_test/mapping_data/28.550/no_sw_version/metadata.json [deleted file]
src/test/resources/metadata/valid_5g_metadata.json
src/test/resources/split_test/nr/type_a_1_event/test.xml
src/test/resources/split_test/nr/type_c_3_events/test.xml
src/test/resources/xml_validator_test/test_data/not_supported_type/no_file_header/test.xml [new file with mode: 0644]
src/test/resources/xml_validator_test/test_data/not_supported_type/no_file_header/validity.props [new file with mode: 0644]
src/test/resources/xml_validator_test/test_data/nr/no_file_header/test.xml
src/test/resources/xml_validator_test/test_data/nr/no_measdata/test.xml
src/test/resources/xml_validator_test/test_data/nr/no_measured_entity/test.xml