Commit ce629822 authored by Yann Garcia's avatar Yann Garcia

Add RnisAPI tests

parent 0dd2792e
......@@ -65,7 +65,7 @@ int json_codec::decode (const OCTETSTRING& p_data, LibItsHttp__JsonMessageBodyTy
} else if (it->second.find("\"problemDetails\"") != std::string::npos) {
UEidentityAPI__TypesAndValues::ProblemDetails problem_details;
problem_details.decode(UEidentityAPI__TypesAndValues::ProblemDetails_descr_, decoding_buffer, TTCN_EncDec::CT_JSON);
msg.problemDetails() = problem_details;
msg.problemDetails__ue__identity() = problem_details;
} else {
loggers::get_instance().warning("json_codec::decode: Unsupported variant");
return -1;
......
......@@ -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/UEidentityAPI"
REFERENCES="LibCommon LibHttp LibMec LibMec/LocationAPI LibMec/RnisAPI LibMec/UEidentityAPI"
for i in ${REFERENCES}
do
# TTCN code
......
......@@ -146,7 +146,7 @@ do
then
cp ${TTCN_3_ORG_PATH}/$i/ttcn/*.ttcn ${TTCN_3_DST_PATH}/$i/ttcn
cp ${TTCN_3_ORG_PATH}/$i/json/*.json ${TTCN_3_DST_PATH}/$i/json
elif [ "$i" == "LibMec/RnsiAPI" ]
elif [ "$i" == "LibMec/RnisAPI" ]
then
cp ${TTCN_3_ORG_PATH}/$i/ttcn/*.ttcn ${TTCN_3_DST_PATH}/$i/ttcn
cp ${TTCN_3_ORG_PATH}/$i/json/*.json ${TTCN_3_DST_PATH}/$i/json
......
......@@ -40,7 +40,7 @@ module AtsMec_RnisAPI_TestCases {
* @desc Check that the RNIS service sends all RNIS subscriptions when requested
* @see Check that the RNIS service sends all RNIS subscriptions when requested
*/
testcase TC_MEC025_RNI_SUBSCRIPTION_05() runs on HttpComponent system HttpTestAdapter {
testcase TC_MEC025_RNI_SUBSCRIPTION_005() runs on HttpComponent system HttpTestAdapter {
// Local variables
var HeaderLines v_headers;
var HttpMessage v_response;
......@@ -90,7 +90,7 @@ module AtsMec_RnisAPI_TestCases {
// Postamble
f_cf_01_http_down();
} // End of testcase TC_MEC025_RNI_SUBSCRIPTION_05
} // End of testcase TC_MEC025_RNI_SUBSCRIPTION_005
} // End of group me_app_role
......
module RnisAPI_Pixits {
modulepar universal charstring PX_SUBSCRIPTION_ID := "7777";
} // End of module RnisAPI_Pixits
module RnisAPI_TypesAndValues {
module RnisAPI_Templates {
// LibCommon
import from LibCommon_BasicTypesAndValues all;
// LibMec/RnisAPI
import from module RnisAPI_TypesAndValues all;
import from RnisAPI_TypesAndValues all;
group subscriptions {
......@@ -17,7 +17,7 @@ module RnisAPI_TypesAndValues {
in template (omit) TimeStamp p_expiryDeadline := omit
) := {
callbackReference := p_callbackReference,
_links := p_links,
links := p_links,
filterCriteria := p_filterCriteria,
expiryDeadline := p_expiryDeadline
} // End of template m_cell_change_subscription
......@@ -29,7 +29,7 @@ module RnisAPI_TypesAndValues {
template TimeStamp p_expiryDeadline := *
) := {
callbackReference := p_callbackReference,
_links := p_links,
links := p_links,
filterCriteria := p_filterCriteria,
expiryDeadline := p_expiryDeadline
} // End of template mw_cell_change_subscription
......@@ -38,4 +38,4 @@ module RnisAPI_TypesAndValues {
} // End of group subscriptions
} // End of module RnisAPI_TypesAndValues
} // End of module RnisAPI_Templates
......@@ -4,6 +4,8 @@ module LibItsHttp_JsonMessageBodyTypes {
import from LocationAPI_TypesAndValues all;
// LibMec/UEidentityAPI
import from UEidentityAPI_TypesAndValues all;
// LibMec/RnisAPI
import from RnisAPI_TypesAndValues all;
/**
* This file volontary contains a trivial declaration of the type JsonBody.
......@@ -16,9 +18,10 @@ module LibItsHttp_JsonMessageBodyTypes {
UserInfo userInfo,
UserList userList,
ZoneInfo zoneInfo,
ProblemDetails problemDetails,
UEidentityAPI_TypesAndValues.ProblemDetails problemDetails_ue_identity,
UeIdentityTagInfo ueIdentityTagInfo,
CellChangeSubscription cellChangeSubscription,
RnisAPI_TypesAndValues.ProblemDetails problemDetails_rnis,
universal charstring raw
} with {
variant ""
......
......@@ -16,6 +16,9 @@ module LibItsHttp_JsonTemplates {
// LibMec/UEidentityAPI
import from UEidentityAPI_TypesAndValues all;
import from UEidentityAPI_Templates all;
// LibMec/RnisAPI
import from RnisAPI_TypesAndValues all;
import from RnisAPI_Templates all;
// TODO Add here your custom RFCs import
......@@ -90,15 +93,15 @@ module LibItsHttp_JsonTemplates {
} // End of template mw_body_json_ue_identity_tag_info
template (value) JsonBody m_body_json_ue_problem_details(
in template (value) ProblemDetails p_problemDetails
in template (value) UEidentityAPI_TypesAndValues.ProblemDetails p_problemDetails
) := {
problemDetails := p_problemDetails
problemDetails_ue_identity := p_problemDetails
} // End of template m_body_json_ue_problem_details
template (present) JsonBody mw_body_json_ue_problem_details(
template (present) ProblemDetails p_problemDetails := ?
template (present) UEidentityAPI_TypesAndValues.ProblemDetails p_problemDetails := ?
) := {
problemDetails := p_problemDetails
problemDetails_ue_identity := p_problemDetails
} // End of template mw_body_json_ue_problem_details
} // End of group ue_identity_api
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment