From 18151c54880666f061ede79cf920a01dd425b696 Mon Sep 17 00:00:00 2001 From: Krzysztof Gajewski Date: Wed, 15 Jul 2020 08:45:51 +0200 Subject: Align CSITs - Adjust pm-mapper to accept new schema. - Adjust xml files for tests: - replaced 28.550 schema with 28.532 standard - Adjust PM_MAPPER_01 test to recent version of the pm-mapper Issue-ID: DCAEGEN2-2308 Signed-off-by: Krzysztof Gajewski Change-Id: I132176b3f504d2d5118976ea987035eccea7d5a2 --- .../new_radio/A20181004.0000-1000-0015-1000_5G.xml | 14 +++++++------- .../pmmapper/assets/new_radio/C20190329.0000-0015.xml | 16 ++++++++-------- .../pmmapper/assets/new_radio/valid_metadata.json | 2 +- tests/dcaegen2-pmmapper/pmmapper/pmmapper.robot | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/tests/dcaegen2-pmmapper/pmmapper/assets/new_radio/A20181004.0000-1000-0015-1000_5G.xml b/tests/dcaegen2-pmmapper/pmmapper/assets/new_radio/A20181004.0000-1000-0015-1000_5G.xml index d826157e..8d42d62c 100644 --- a/tests/dcaegen2-pmmapper/pmmapper/assets/new_radio/A20181004.0000-1000-0015-1000_5G.xml +++ b/tests/dcaegen2-pmmapper/pmmapper/assets/new_radio/A20181004.0000-1000-0015-1000_5G.xml @@ -1,14 +1,14 @@ - - +xsi:schemaLocation="http://www.3gpp.org/ftp/specs/archive/28_series/28.532#measData http://www.3gpp.org/ftp/specs/archive/28_series/28.532#measData"> + - + - + @@ -83,6 +83,6 @@ xsi:schemaLocation="http://www.3gpp.org/ftp/specs/archive/28_series/28.550#measD - + - + diff --git a/tests/dcaegen2-pmmapper/pmmapper/assets/new_radio/C20190329.0000-0015.xml b/tests/dcaegen2-pmmapper/pmmapper/assets/new_radio/C20190329.0000-0015.xml index 439d5768..9c1b9857 100644 --- a/tests/dcaegen2-pmmapper/pmmapper/assets/new_radio/C20190329.0000-0015.xml +++ b/tests/dcaegen2-pmmapper/pmmapper/assets/new_radio/C20190329.0000-0015.xml @@ -1,11 +1,11 @@ - + + fileFormatVersion="28.532 V1.0"> - + - + @@ -18,7 +18,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -44,6 +44,6 @@ - + - + diff --git a/tests/dcaegen2-pmmapper/pmmapper/assets/new_radio/valid_metadata.json b/tests/dcaegen2-pmmapper/pmmapper/assets/new_radio/valid_metadata.json index 4c5c84f1..f75adb84 100644 --- a/tests/dcaegen2-pmmapper/pmmapper/assets/new_radio/valid_metadata.json +++ b/tests/dcaegen2-pmmapper/pmmapper/assets/new_radio/valid_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" } diff --git a/tests/dcaegen2-pmmapper/pmmapper/pmmapper.robot b/tests/dcaegen2-pmmapper/pmmapper/pmmapper.robot index 96d33a86..7f99e120 100644 --- a/tests/dcaegen2-pmmapper/pmmapper/pmmapper.robot +++ b/tests/dcaegen2-pmmapper/pmmapper/pmmapper.robot @@ -39,7 +39,7 @@ ${CLI_MR_LOG} cat /tmp/mr.log Verify PM Mapper Receive Configuraton From Config Binding Service [Tags] PM_MAPPER_01 [Documentation] Verify 3gpp pm mapper successfully receive config data from CBS - CheckLog ${CLI_EXEC_CLI_CONFIG} Received pm-mapper configuration + CheckLog ${CLI_EXEC_CLI_CONFIG} Response code: 200, Server Response Received Verify Health Check returns 200 when a REST GET request to healthcheck url [Tags] PM_MAPPER_02 @@ -164,4 +164,4 @@ CheckLog VerifyResponse [Arguments] ${actual_response_value} ${expected_response_value} - Should Be Equal As Strings ${actual_response_value} ${expected_response_value} \ No newline at end of file + Should Be Equal As Strings ${actual_response_value} ${expected_response_value} -- cgit 1.2.3-korg