From d9aa64ddd03d0313e8c1157bdc9d6b841d0dd973 Mon Sep 17 00:00:00 2001 From: YannGarcia Date: Tue, 17 Dec 2019 17:55:34 +0100 Subject: [PATCH] Validation againt AdvantEDGE commit 068ed0f7f2175c6c969c2ae0ba3494ac6b8ff851 --- ccsrc/Protocols/Json/json_codec.cc | 3 ++- etc/AtsMec/AtsMec_AdvantEDGE.cfg | 5 +++-- scripts/mec_generate_makefile.bash | 2 +- ttcn/AtsMec/AtsMec_LocationAPI_TestCases.ttcn | 2 +- ttcn/AtsMec/AtsMec_RadioNodeLocationAPI_TestCases.ttcn | 4 ++-- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ccsrc/Protocols/Json/json_codec.cc b/ccsrc/Protocols/Json/json_codec.cc index 0793b41..dbb523e 100644 --- a/ccsrc/Protocols/Json/json_codec.cc +++ b/ccsrc/Protocols/Json/json_codec.cc @@ -56,7 +56,8 @@ int json_codec::decode (const OCTETSTRING& p_data, LibItsHttp__JsonMessageBodyTy return -1; } } - + loggers::get_instance().log("json_codec::decode: decode_str=%s", it->second.c_str()); + TTCN_EncDec::set_error_behavior(TTCN_EncDec::ET_ALL, TTCN_EncDec::EB_DEFAULT); TTCN_EncDec::clear_error(); // Remove data structure name... diff --git a/etc/AtsMec/AtsMec_AdvantEDGE.cfg b/etc/AtsMec/AtsMec_AdvantEDGE.cfg index 86958ff..3ef1653 100644 --- a/etc/AtsMec/AtsMec_AdvantEDGE.cfg +++ b/etc/AtsMec/AtsMec_AdvantEDGE.cfg @@ -84,7 +84,7 @@ system.httpPort_notif.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server #AtsMec_UEidentityAPI_TestCases.TC_MEC_SRV_UETAG_002_PF # ETSI GS MEC 013 -AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCLOOK_001_OK +#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCLOOK_001_OK #AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCLOOK_001_BR #AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCLOOK_001_NF @@ -107,7 +107,8 @@ AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCLOOK_001_OK #AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UEINFSUB_002_OK #AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UEINFSUB_002_NF -#AtsMec_RadioNodeLocationAPI_TestCases.TP_MEC_SRV_RLOCLOOK_001_OK +AtsMec_RadioNodeLocationAPI_TestCases.TC_MEC_SRV_RLOCLOOK_001_OK +AtsMec_RadioNodeLocationAPI_TestCases.TC_MEC_SRV_RLOCLOOK_001_NF #AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_011_OK #AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_012_OK diff --git a/scripts/mec_generate_makefile.bash b/scripts/mec_generate_makefile.bash index 2cb9ada..8553a04 100755 --- a/scripts/mec_generate_makefile.bash +++ b/scripts/mec_generate_makefile.bash @@ -52,7 +52,7 @@ find .. -type f -name "*.bak" -exec rm {} \; find .. -type f -name "*.log" -exec rm {} \; # Build JSON files if any and put them in objs directory -REFERENCES="LibCommon LibHttp LibMec LibMec/LocationAPI LibMec/RnisAPI LibMec/UEidentityAPI LibMec/BwManagementAPI" +REFERENCES="LibCommon LibHttp LibMec LibMec/Ams LibMec/AppEna LibMec/AppLCM LibMec/BwManagementAPI LibMec/FixedAccessInformationAPI LibMec/Grant LibMec/LocationAPI LibMec/MeoPkgm LibMec/MepmPkgm LibMec/RnisAPI LibMec/UEidentityAPI" for i in ${REFERENCES} do # TTCN code diff --git a/ttcn/AtsMec/AtsMec_LocationAPI_TestCases.ttcn b/ttcn/AtsMec/AtsMec_LocationAPI_TestCases.ttcn index 771b77e..36db95b 100644 --- a/ttcn/AtsMec/AtsMec_LocationAPI_TestCases.ttcn +++ b/ttcn/AtsMec/AtsMec_LocationAPI_TestCases.ttcn @@ -771,7 +771,7 @@ module AtsMec_LocationAPI_TestCases { httpPort.send( m_http_request( m_http_request_get( - "/" & PICS_ROOT_API & PX_ME_APP_Q_USERS_LIST_URI & "/invalid/" & oct2char(unichar2oct(PX_USER, "UTF-8")), + "/" & PICS_ROOT_API & PX_ME_APP_Q_USERS_LIST_URI/* & "/invalid/"*/ & oct2char(unichar2oct(PX_USER, "UTF-8")), v_headers ) ) diff --git a/ttcn/AtsMec/AtsMec_RadioNodeLocationAPI_TestCases.ttcn b/ttcn/AtsMec/AtsMec_RadioNodeLocationAPI_TestCases.ttcn index 8245781..4ecc01d 100644 --- a/ttcn/AtsMec/AtsMec_RadioNodeLocationAPI_TestCases.ttcn +++ b/ttcn/AtsMec/AtsMec_RadioNodeLocationAPI_TestCases.ttcn @@ -67,7 +67,7 @@ module AtsMec_RadioNodeLocationAPI_TestCases { httpPort.send( m_http_request( m_http_request_get( - PX_ME_APP_Q_ZONE_ID_URI & "/" & oct2char(unichar2oct(PX_ZONE_ID, "UTF-8")) & "/accessPoints", + "/" & PICS_ROOT_API & PX_ME_APP_Q_ZONE_ID_URI & "/" & oct2char(unichar2oct(PX_ZONE_ID, "UTF-8")) & "/accessPoints", v_headers ) ) @@ -1003,7 +1003,7 @@ module AtsMec_RadioNodeLocationAPI_TestCases { httpPort.send( m_http_request( m_http_request_post( - "/" & PICS_ROOT_API & oct2char(unichar2oct(PX_UE_ZONAL_TRAF_SUB_URI, "UTF-8")), + "/" & PICS_ROOT_API & PX_UE_ZONAL_TRAF_SUB_URI, v_headers, m_http_message_body_json( m_body_json_zonal_traffic_subscription( -- GitLab