Add support for TS 28.550/28.532 09/100309/2
authorJoeOLeary <joseph.o.leary@est.tech>
Tue, 14 Jan 2020 10:54:59 +0000 (10:54 +0000)
committerJoeOLeary <joseph.o.leary@est.tech>
Tue, 21 Jan 2020 13:50:18 +0000 (13:50 +0000)
commit255235644c8c302e1e92c41c13be3f3ad5973b16
tree762a609b5f4f0f55c6245a7f6bd91111656e0efb
parenta6e22b38d721fabeee786be9914a9a80da1ceb86
Add support for TS 28.550/28.532

Issue-ID: DCAEGEN2-1912
Change-Id: If05c3673a240e6ea5e3d1caca3ff5bf5828590d3
Signed-off-by: JoeOLeary <joseph.o.leary@est.tech>
98 files changed:
pom.xml
src/main/java/org/onap/dcaegen2/services/pmmapper/App.java
src/main/java/org/onap/dcaegen2/services/pmmapper/exceptions/TemplateIdentificationException.java [moved from src/main/java/org/onap/dcaegen2/services/pmmapper/model/package-info.java with 71% similarity]
src/main/java/org/onap/dcaegen2/services/pmmapper/filtering/MeasFilterHandler.java
src/main/java/org/onap/dcaegen2/services/pmmapper/mapping/Mapper.java
src/main/java/org/onap/dcaegen2/services/pmmapper/model/Event.java
src/main/java/org/onap/dcaegen2/services/pmmapper/model/MeasCollecFile.java [deleted file]
src/main/java/org/onap/dcaegen2/services/pmmapper/model/measurement/common/MeasurementData.java [new file with mode: 0644]
src/main/java/org/onap/dcaegen2/services/pmmapper/model/measurement/common/MeasurementFile.java [new file with mode: 0644]
src/main/java/org/onap/dcaegen2/services/pmmapper/model/measurement/common/MeasurementInfo.java [new file with mode: 0644]
src/main/java/org/onap/dcaegen2/services/pmmapper/model/measurement/lte/MeasCollecFile.java [new file with mode: 0644]
src/main/java/org/onap/dcaegen2/services/pmmapper/model/measurement/nr/MeasDataFile.java [new file with mode: 0644]
src/main/java/org/onap/dcaegen2/services/pmmapper/utils/MeasConverter.java
src/main/java/org/onap/dcaegen2/services/pmmapper/utils/MeasSplitter.java
src/main/java/org/onap/dcaegen2/services/pmmapper/utils/XMLValidator.java
src/main/resources/Dockerfile
src/main/resources/schemas/org.3GPP.28.550#measData [new file with mode: 0644]
src/main/resources/schemas/org.3GPP.32.435#measCollec [new file with mode: 0644]
src/main/resources/templates/org.3GPP.28.550#measData [new file with mode: 0644]
src/main/resources/templates/org.3GPP.32.435#measCollec [new file with mode: 0644]
src/test/java/org/onap/dcaegen2/services/pmmapper/AppTest.java
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/DataRouterUtilsTest.java
src/test/java/org/onap/dcaegen2/services/pmmapper/utils/MeasConverterTest.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/ArgumentCreator.java [new file with mode: 0644]
src/test/java/utils/EventUtils.java
src/test/resources/filter_test/lte/meas_results/expected.xml [moved from src/test/resources/filter_test/meas_results_filtered.xml with 100% similarity]
src/test/resources/filter_test/lte/meas_results/test.xml [moved from src/test/resources/filter_test/meas_results.xml with 100% similarity]
src/test/resources/filter_test/lte/meas_results_manyinfo/expected.xml [moved from src/test/resources/filter_test/meas_results_manyInfo_filtered.xml with 100% similarity]
src/test/resources/filter_test/lte/meas_results_manyinfo/test.xml [moved from src/test/resources/filter_test/meas_results_manyInfo.xml with 100% similarity]
src/test/resources/filter_test/lte/meas_type_and_r/expected.xml [moved from src/test/resources/filter_test/meas_type_and_r_filtered.xml with 100% similarity]
src/test/resources/filter_test/lte/meas_type_and_r/test.xml [moved from src/test/resources/filter_test/meas_type_and_r.xml with 100% similarity]
src/test/resources/filter_test/lte/meas_type_and_r_many_measvalue/expected.xml [moved from src/test/resources/filter_test/meas_type_and_r_manyMeasvalue_filtered.xml with 100% similarity]
src/test/resources/filter_test/lte/meas_type_and_r_many_measvalue/test.xml [moved from src/test/resources/filter_test/meas_type_and_r_manyMeasvalue.xml with 100% similarity]
src/test/resources/filter_test/lte/meas_type_and_r_manyinfo/expected.xml [moved from src/test/resources/filter_test/meas_type_and_r_manyInfo_filtered.xml with 100% similarity]
src/test/resources/filter_test/lte/meas_type_and_r_manyinfo/test.xml [moved from src/test/resources/filter_test/meas_type_and_r_manyInfo.xml with 100% similarity]
src/test/resources/filter_test/nr/meas_results/expected.xml [new file with mode: 0644]
src/test/resources/filter_test/nr/meas_results/test.xml [new file with mode: 0644]
src/test/resources/filter_test/nr/meas_results_manyinfo/expected.xml [new file with mode: 0644]
src/test/resources/filter_test/nr/meas_results_manyinfo/test.xml [new file with mode: 0644]
src/test/resources/filter_test/nr/meas_type_and_r/expected.xml [new file with mode: 0644]
src/test/resources/filter_test/nr/meas_type_and_r/test.xml [new file with mode: 0644]
src/test/resources/filter_test/nr/meas_type_and_r_many_measvalue/expected.xml [new file with mode: 0644]
src/test/resources/filter_test/nr/meas_type_and_r_many_measvalue/test.xml [new file with mode: 0644]
src/test/resources/filter_test/nr/meas_type_and_r_manyinfo/expected.xml [new file with mode: 0644]
src/test/resources/filter_test/nr/meas_type_and_r_manyinfo/test.xml [new file with mode: 0644]
src/test/resources/mapper_test/mapping_data/28.550/meas_results/metadata.json [new file with mode: 0644]
src/test/resources/mapper_test/mapping_data/28.550/meas_results/test.xml [new file with mode: 0644]
src/test/resources/mapper_test/mapping_data/28.550/meas_type_and_r/metadata.json [new file with mode: 0644]
src/test/resources/mapper_test/mapping_data/28.550/meas_type_and_r/test.xml [new file with mode: 0644]
src/test/resources/mapper_test/mapping_data/28.550/meas_type_and_r_many_meas_values/metadata.json [new file with mode: 0644]
src/test/resources/mapper_test/mapping_data/28.550/meas_type_and_r_many_meas_values/test.xml [new file with mode: 0644]
src/test/resources/mapper_test/mapping_data/28.550/meas_types_and_meas_results_many_meas_values/metadata.json [new file with mode: 0644]
src/test/resources/mapper_test/mapping_data/28.550/meas_types_and_meas_results_many_meas_values/test.xml [new file with mode: 0644]
src/test/resources/mapper_test/mapping_data/28.550/no_measdata/metadata.json [new file with mode: 0644]
src/test/resources/mapper_test/mapping_data/28.550/no_measdata/test.xml [new file with mode: 0644]
src/test/resources/mapper_test/mapping_data/28.550/no_sw_version/metadata.json [new file with mode: 0644]
src/test/resources/mapper_test/mapping_data/28.550/no_sw_version/test.xml [new file with mode: 0644]
src/test/resources/mapper_test/mapping_data/32.435/meas_results/metadata.json [new file with mode: 0644]
src/test/resources/mapper_test/mapping_data/32.435/meas_results/test.xml [moved from src/test/resources/mapper_test/mapping_data/valid_data/meas_results.xml with 100% similarity]
src/test/resources/mapper_test/mapping_data/32.435/meas_type_and_r/metadata.json [new file with mode: 0644]
src/test/resources/mapper_test/mapping_data/32.435/meas_type_and_r/test.xml [moved from src/test/resources/mapper_test/mapping_data/valid_data/meas_type_and_r.xml with 100% similarity]
src/test/resources/mapper_test/mapping_data/32.435/meas_type_and_r_many_meas_values/metadata.json [new file with mode: 0644]
src/test/resources/mapper_test/mapping_data/32.435/meas_type_and_r_many_meas_values/test.xml [moved from src/test/resources/mapper_test/mapping_data/valid_data/meas_type_and_r_many_meas_values.xml with 100% similarity]
src/test/resources/mapper_test/mapping_data/32.435/meas_types_and_meas_results_many_meas_values/metadata.json [new file with mode: 0644]
src/test/resources/mapper_test/mapping_data/32.435/meas_types_and_meas_results_many_meas_values/test.xml [moved from src/test/resources/mapper_test/mapping_data/valid_data/meas_types_and_meas_results_many_meas_values.xml with 100% similarity]
src/test/resources/mapper_test/mapping_data/32.435/no_measdata/metadata.json [new file with mode: 0644]
src/test/resources/mapper_test/mapping_data/32.435/no_measdata/test.xml [moved from src/test/resources/mapper_test/mapping_data/valid_data/no_measdata.xml with 100% similarity]
src/test/resources/mapper_test/mapping_data/32.435/no_sw_version/metadata.json [new file with mode: 0644]
src/test/resources/mapper_test/mapping_data/32.435/no_sw_version/test.xml [moved from src/test/resources/mapper_test/mapping_data/valid_data/no_sw_version.xml with 100% similarity]
src/test/resources/metadata/invalid_metadata.json [new file with mode: 0644]
src/test/resources/metadata/valid_4g_metadata.json [new file with mode: 0644]
src/test/resources/metadata/valid_5g_metadata.json [new file with mode: 0644]
src/test/resources/split_test/lte/type_a_1_event/split.props [new file with mode: 0644]
src/test/resources/split_test/lte/type_a_1_event/test.xml [new file with mode: 0644]
src/test/resources/split_test/lte/type_c_3_events/split.props [new file with mode: 0644]
src/test/resources/split_test/lte/type_c_3_events/test.xml [new file with mode: 0644]
src/test/resources/split_test/nr/type_a_1_event/split.props [new file with mode: 0644]
src/test/resources/split_test/nr/type_a_1_event/test.xml [new file with mode: 0644]
src/test/resources/split_test/nr/type_c_3_events/split.props [new file with mode: 0644]
src/test/resources/split_test/nr/type_c_3_events/test.xml [new file with mode: 0644]
src/test/resources/xml_validator_test/test_data/lte/no_file_header/test.xml [moved from src/test/resources/xml_validator_test/test_data/invalid/no_file_header.xml with 100% similarity]
src/test/resources/xml_validator_test/test_data/lte/no_file_header/validity.props [new file with mode: 0644]
src/test/resources/xml_validator_test/test_data/lte/no_managed_element/test.xml [moved from src/test/resources/xml_validator_test/test_data/invalid/no_managed_element.xml with 100% similarity]
src/test/resources/xml_validator_test/test_data/lte/no_managed_element/validity.props [new file with mode: 0644]
src/test/resources/xml_validator_test/test_data/lte/no_measdata/test.xml [moved from src/test/resources/xml_validator_test/test_data/valid/no_measdata.xml with 100% similarity]
src/test/resources/xml_validator_test/test_data/lte/no_measdata/validity.props [new file with mode: 0644]
src/test/resources/xml_validator_test/test_data/nr/no_file_header/test.xml [new file with mode: 0644]
src/test/resources/xml_validator_test/test_data/nr/no_file_header/validity.props [new file with mode: 0644]
src/test/resources/xml_validator_test/test_data/nr/no_measdata/test.xml [new file with mode: 0644]
src/test/resources/xml_validator_test/test_data/nr/no_measdata/validity.props [new file with mode: 0644]
src/test/resources/xml_validator_test/test_data/nr/no_measured_entity/test.xml [new file with mode: 0644]
src/test/resources/xml_validator_test/test_data/nr/no_measured_entity/validity.props [new file with mode: 0644]
version.properties