Commit ead3cfdb authored by YannGarcia's avatar YannGarcia
Browse files

Resolve conflict in scripts/update_mec_project.bash

parents f3d631d4 d9aa64dd
...@@ -12,7 +12,7 @@ See the attached LICENSE file or visit https://forge.etsi.org/legal-matters. ...@@ -12,7 +12,7 @@ See the attached LICENSE file or visit https://forge.etsi.org/legal-matters.
## Standard links ## Standard links
- Mobile-Edge Computation standards, accessible [here](https://www.etsi.org/standards#page=1&search=MEC&title=1&etsiNumber=1&content=1&version=0&onApproval=1&published=1&historical=1&startDate=1988-01-15&endDate=2019-05-06&harmonized=0&keyword=&TB=&stdType=&frequency=&mandate=&collection=&sort=1) - Multi-access Edge Computating standards, accessible [here](https://www.etsi.org/standards#page=1&search=MEC&title=1&etsiNumber=1&content=1&version=0&onApproval=1&published=1&historical=1&startDate=1988-01-15&endDate=2019-05-06&harmonized=0&keyword=&TB=&stdType=&frequency=&mandate=&collection=&sort=1).
## RFC links ## RFC links
- RFC 7159 - The JavaScript Object Notation (JSON) Data Interchange Format, accessible [here](https://tools.ietf.org/html/rfc7159.html) - RFC 7159 - The JavaScript Object Notation (JSON) Data Interchange Format, accessible [here](https://tools.ietf.org/html/rfc7159.html)
......
...@@ -56,7 +56,8 @@ int json_codec::decode (const OCTETSTRING& p_data, LibItsHttp__JsonMessageBodyTy ...@@ -56,7 +56,8 @@ int json_codec::decode (const OCTETSTRING& p_data, LibItsHttp__JsonMessageBodyTy
return -1; 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::set_error_behavior(TTCN_EncDec::ET_ALL, TTCN_EncDec::EB_DEFAULT);
TTCN_EncDec::clear_error(); TTCN_EncDec::clear_error();
// Remove data structure name... // Remove data structure name...
......
...@@ -17,8 +17,7 @@ namespace LibMec__Functions { ...@@ -17,8 +17,7 @@ namespace LibMec__Functions {
* @return Timestamp - current time since 01/01/2004 in milliseconds * @return Timestamp - current time since 01/01/2004 in milliseconds
* @see fx_getCurrentTime() return TimestampIts * @see fx_getCurrentTime() return TimestampIts
*/ */
INTEGER fx__getCurrentTime( INTEGER fx__getCurrentTime() {
) {
INTEGER i; INTEGER i;
i.set_long_long_val(base_time::get_instance().get_its_current_time_ms()); i.set_long_long_val(base_time::get_instance().get_its_current_time_ms());
loggers::get_instance().log_msg("<<< fx__getCurrentTime: ", i); loggers::get_instance().log_msg("<<< fx__getCurrentTime: ", i);
...@@ -35,4 +34,12 @@ namespace LibMec__Functions { ...@@ -35,4 +34,12 @@ namespace LibMec__Functions {
return i; return i;
} }
/**
* @desc Convert a float value into a string
* @return The string formated value
*/
CHARSTRING fx__float2str(const FLOAT& p_value) {
return float2str(p_value);
}
} // end of Namespace } // end of Namespace
...@@ -49,6 +49,7 @@ LogEventTypes:= Yes ...@@ -49,6 +49,7 @@ LogEventTypes:= Yes
[TESTPORT_PARAMETERS] [TESTPORT_PARAMETERS]
# In this section you can specify parameters that are passed to Test Ports. # In this section you can specify parameters that are passed to Test Ports.
system.httpPort.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server=172.22.1.6,port=31007,use_ssl=0)" system.httpPort.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server=172.22.1.6,port=31007,use_ssl=0)"
#system.httpPort.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server=172.28.4.253,port=30007,use_ssl=0)"
system.httpPort_notif.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server_mode=1,local_port=8081,use_ssl=0)" system.httpPort_notif.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server_mode=1,local_port=8081,use_ssl=0)"
[DEFINE] [DEFINE]
...@@ -82,10 +83,10 @@ system.httpPort_notif.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server ...@@ -82,10 +83,10 @@ system.httpPort_notif.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server
#AtsMec_UEidentityAPI_TestCases.TC_MEC_SRV_UETAG_002_BR #AtsMec_UEidentityAPI_TestCases.TC_MEC_SRV_UETAG_002_BR
#AtsMec_UEidentityAPI_TestCases.TC_MEC_SRV_UETAG_002_PF #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_BR
AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCLOOK_001_NF #AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCLOOK_001_NF
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCSUB_001_OK #AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCSUB_001_OK
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCSUB_001_BR #AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCSUB_001_BR
...@@ -106,6 +107,9 @@ AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCLOOK_001_NF ...@@ -106,6 +107,9 @@ AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCLOOK_001_NF
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UEINFSUB_002_OK #AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UEINFSUB_002_OK
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UEINFSUB_002_NF #AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UEINFSUB_002_NF
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_011_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_012_OK #AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_012_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_011_BR #AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_011_BR
......
...@@ -52,7 +52,7 @@ find .. -type f -name "*.bak" -exec rm {} \; ...@@ -52,7 +52,7 @@ find .. -type f -name "*.bak" -exec rm {} \;
find .. -type f -name "*.log" -exec rm {} \; find .. -type f -name "*.log" -exec rm {} \;
# Build JSON files if any and put them in objs directory # 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} for i in ${REFERENCES}
do do
# TTCN code # TTCN code
......
...@@ -134,27 +134,7 @@ do ...@@ -134,27 +134,7 @@ do
fi fi
cp ${TTCN_3_ORG_PATH}/$i/*.ttcn ${TTCN_3_DST_PATH}/$i/ttcn cp ${TTCN_3_ORG_PATH}/$i/*.ttcn ${TTCN_3_DST_PATH}/$i/ttcn
# Update files # Update files
if [ "$i" == "LibMec" ] if [ "$i" == "LibHttp" ]
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/LocationAPI" ]
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/UEidentityAPI" ]
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/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
elif [ "$i" == "LibMec/BwManagementAPI" ]
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" == "LibHttp" ]
then then
cp ${TTCN_3_ORG_PATH}/LibIts/ttcn/Http/*.ttcn ${TTCN_3_DST_PATH}/$i/ttcn cp ${TTCN_3_ORG_PATH}/LibIts/ttcn/Http/*.ttcn ${TTCN_3_DST_PATH}/$i/ttcn
cp ${CC_SRC_PATH}/EncDec/$i/*_Encdec.cc ${TTCN_3_DST_PATH}/$i/src cp ${CC_SRC_PATH}/EncDec/$i/*_Encdec.cc ${TTCN_3_DST_PATH}/$i/src
...@@ -169,6 +149,14 @@ do ...@@ -169,6 +149,14 @@ do
cp ${TTCN_3_ORG_PATH}/$i/ttcn/*.ttcn ${TTCN_3_DST_PATH}/$i/ttcn cp ${TTCN_3_ORG_PATH}/$i/ttcn/*.ttcn ${TTCN_3_DST_PATH}/$i/ttcn
# Patch TITAN due to TTCN-3 compiler issues # Patch TITAN due to TTCN-3 compiler issues
cp ${SRC_MEC_PATH}/ttcn/patch_lib_common_titan/*.ttcn ${TTCN_3_DST_PATH}/$i/ttcn cp ${SRC_MEC_PATH}/ttcn/patch_lib_common_titan/*.ttcn ${TTCN_3_DST_PATH}/$i/ttcn
elif [ "$i" == "LibMec/Ams" ]
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
rm -f ${TTCN_3_DST_PATH}/$i/ttcn/Ams_sEncdecDeclarations.ttcn
else
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
fi fi
done done
......
...@@ -1246,8 +1246,7 @@ ...@@ -1246,8 +1246,7 @@
alt { alt {
[] httpPort.receive( [] httpPort.receive(
mw_http_response( mw_http_response(
mw_http_response_204_no_content( mw_http_response_204_no_content
)
) )
) )
{ {
......
...@@ -1626,7 +1626,7 @@ module AtsMec_AppEnablementAPI_TestCases { ...@@ -1626,7 +1626,7 @@ module AtsMec_AppEnablementAPI_TestCases {
alt { alt {
[] httpPort.receive( [] httpPort.receive(
mw_http_response( mw_http_response(
mw_http_response_412_precondition_failed() mw_http_response_412_precondition_failed
)) { )) {
tc_ac.stop; tc_ac.stop;
......
...@@ -361,8 +361,8 @@ module AtsMec_AppLCM_TestCases { ...@@ -361,8 +361,8 @@ module AtsMec_AppLCM_TestCases {
alt { alt {
[] httpPort.receive( [] httpPort.receive(
mw_http_response( mw_http_response(
mw_http_response_204_no_content( mw_http_response_204_no_content
))) -> value v_response { )) -> value v_response {
tc_ac.stop; tc_ac.stop;
log("*** " & testcasename() & ": PASS: IUT successfully responds with a 204 no content status code ***"); log("*** " & testcasename() & ": PASS: IUT successfully responds with a 204 no content status code ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_success); f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
...@@ -1471,7 +1471,7 @@ group app_lcm_subscriptions { ...@@ -1471,7 +1471,7 @@ group app_lcm_subscriptions {
alt { alt {
[] httpPort.receive( [] httpPort.receive(
mw_http_response( mw_http_response(
mw_http_response_204_no_content() mw_http_response_204_no_content
)) -> value v_response { )) -> value v_response {
tc_ac.stop; tc_ac.stop;
...@@ -1576,7 +1576,7 @@ group app_lcm__notification { ...@@ -1576,7 +1576,7 @@ group app_lcm__notification {
[] httpPort_notif.receive( [] httpPort_notif.receive(
mw_http_request( mw_http_request(
mw_http_request_post( mw_http_request_post(
unichar2char(PX_CALLBACK_URI), oct2char(unichar2oct(PX_CALLBACK_URI)),
-, -,
mw_http_message_body_json( mw_http_message_body_json(
mw_body_json_lcm_notification( mw_body_json_lcm_notification(
......
...@@ -177,7 +177,7 @@ module AtsMec_LocationAPI_TestCases { ...@@ -177,7 +177,7 @@ module AtsMec_LocationAPI_TestCases {
httpPort.send( httpPort.send(
m_http_request( m_http_request(
m_http_request_get( m_http_request_get(
"/" & PICS_ROOT_API & PX_ME_APP_Q_USERS_LIST_URI & "?zoneId=" & oct2char(unichar2oct(NON_EXISTENT_ZONE_ID, "UTF-8")), "/" & PICS_ROOT_API & PX_ME_APP_Q_USERS_LIST_URI & "?zoneId=" & oct2char(unichar2oct(PX_NON_EXISTENT_ZONE_ID, "UTF-8")),
v_headers v_headers
) )
) )
...@@ -259,11 +259,11 @@ module AtsMec_LocationAPI_TestCases { ...@@ -259,11 +259,11 @@ module AtsMec_LocationAPI_TestCases {
mw_http_response_201_created( mw_http_response_201_created(
mw_http_message_body_json( mw_http_message_body_json(
mw_body_json_user_tracking_subscription( mw_body_json_user_tracking_subscription(
mw_user_tracking_subscription_response( mw_user_tracking_subscription(
PX_CLIENT_ID, PX_CLIENT_ID,
PX_CALLBACK_REF_URL, PX_CALLBACK_REF_URL,
PX_USER PX_USER
)))))) { )))))) {
tc_ac.stop; tc_ac.stop;
log("*** " & testcasename() & ": PASS: IUT successfully responds with a callbackURL ***"); log("*** " & testcasename() & ": PASS: IUT successfully responds with a callbackURL ***");
...@@ -367,7 +367,7 @@ module AtsMec_LocationAPI_TestCases { ...@@ -367,7 +367,7 @@ module AtsMec_LocationAPI_TestCases {
httpPort.send( httpPort.send(
m_http_request( m_http_request(
m_http_request_delete( m_http_request_delete(
"/" & PICS_ROOT_API & PX_ME_APP_Q_USERS_LOC_SUB_URI & "/" & PX_SUBSCRIPTION_ID, // TODO Shall be extract from Subscription request "/" & PICS_ROOT_API & PX_ME_APP_Q_USERS_LOC_SUB_URI & "/" & oct2char(unichar2oct(PX_SUBSCRIPTION_ID, "UTF-8")), // TODO Shall be extract from Subscription request
v_headers v_headers
) )
) )
...@@ -421,7 +421,7 @@ module AtsMec_LocationAPI_TestCases { ...@@ -421,7 +421,7 @@ module AtsMec_LocationAPI_TestCases {
httpPort.send( httpPort.send(
m_http_request( m_http_request(
m_http_request_delete( m_http_request_delete(
"/" & PICS_ROOT_API & PX_ME_APP_Q_USERS_LOC_SUB_URI & "/" & PX_SUBSCRIPTION_ID_UNKNOWN, // TODO Shall be extract from Subscription request "/" & PICS_ROOT_API & PX_ME_APP_Q_USERS_LOC_SUB_URI & "/" & oct2char(unichar2oct(PX_NON_EXISTENT_SUBSCRIPTION_ID, "UTF-8")), // TODO Shall be extract from Subscription request
v_headers v_headers
) )
) )
...@@ -479,7 +479,7 @@ module AtsMec_LocationAPI_TestCases { ...@@ -479,7 +479,7 @@ module AtsMec_LocationAPI_TestCases {
httpPort.send( httpPort.send(
m_http_request( m_http_request(
m_http_request_post( m_http_request_post(
"/" & PICS_ROOT_API & PX_ME_APP_Q_USERS_TRACK_SUB_URI & "/" & PX_SUBSCRIPTION_ID, "/" & PICS_ROOT_API & PX_ME_APP_Q_USERS_TRACK_SUB_URI & "/" & oct2char(unichar2oct(PX_SUBSCRIPTION_ID, "UTF-8")),
v_headers v_headers
) )
) )
...@@ -494,11 +494,11 @@ module AtsMec_LocationAPI_TestCases { ...@@ -494,11 +494,11 @@ module AtsMec_LocationAPI_TestCases {
mw_http_response_201_created( mw_http_response_201_created(
mw_http_message_body_json( mw_http_message_body_json(
mw_body_json_user_tracking_subscription( mw_body_json_user_tracking_subscription(
mw_user_tracking_subscription_response( mw_user_tracking_subscription(
PX_CLIENT_ID, PX_CLIENT_ID,
PX_CALLBACK_REF_URL, PX_CALLBACK_REF_URL,
PX_USER PX_USER
)))))) { )))))) {
tc_ac.stop; tc_ac.stop;
log("*** " & testcasename() & ": PASS: IUT successfully responds with a callbackURL ***"); log("*** " & testcasename() & ": PASS: IUT successfully responds with a callbackURL ***");
...@@ -602,7 +602,7 @@ module AtsMec_LocationAPI_TestCases { ...@@ -602,7 +602,7 @@ module AtsMec_LocationAPI_TestCases {
httpPort.send( httpPort.send(
m_http_request( m_http_request(
m_http_request_delete( m_http_request_delete(
"/" & PICS_ROOT_API & PX_ME_APP_Q_USERS_TRACK_SUB_URI & "/" & PX_SUBSCRIPTION_ID, "/" & PICS_ROOT_API & PX_ME_APP_Q_USERS_TRACK_SUB_URI & "/" & oct2char(unichar2oct(PX_SUBSCRIPTION_ID, "UTF-8")),
v_headers v_headers
) )
) )
...@@ -656,7 +656,7 @@ module AtsMec_LocationAPI_TestCases { ...@@ -656,7 +656,7 @@ module AtsMec_LocationAPI_TestCases {
httpPort.send( httpPort.send(
m_http_request( m_http_request(
m_http_request_delete( m_http_request_delete(
"/" & PICS_ROOT_API & PX_ME_APP_Q_USERS_TRACK_SUB_URI & "/" & PX_SUBSCRIPTION_ID_UNKNOWN, "/" & PICS_ROOT_API & PX_ME_APP_Q_USERS_TRACK_SUB_URI & "/" & oct2char(unichar2oct(PX_NON_EXISTENT_SUBSCRIPTION_ID, "UTF-8")),
v_headers v_headers
) )
) )
...@@ -771,7 +771,7 @@ module AtsMec_LocationAPI_TestCases { ...@@ -771,7 +771,7 @@ module AtsMec_LocationAPI_TestCases {
httpPort.send( httpPort.send(
m_http_request( m_http_request(
m_http_request_get( 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 v_headers
) )
) )
......
...@@ -1213,7 +1213,7 @@ group pkg_management_notification { ...@@ -1213,7 +1213,7 @@ group pkg_management_notification {
[] httpPort_notif.receive( [] httpPort_notif.receive(
mw_http_request( mw_http_request(
mw_http_request_post( mw_http_request_post(
unichar2char(PX_CALLBACK_URI), oct2char(unichar2oct(PX_CALLBACK_URI)),
-, -,
mw_http_message_body_json( mw_http_message_body_json(
mw_body_json_app_package_notification( mw_body_json_app_package_notification(
......
...@@ -73,18 +73,18 @@ module AtsMec_PkgMgmt_mm3_TestCases { ...@@ -73,18 +73,18 @@ module AtsMec_PkgMgmt_mm3_TestCases {
mw_http_response_ok( mw_http_response_ok(
mw_http_message_body_json( mw_http_message_body_json(
mw_body_json_mepm_pkg_mgmt_response_list( mw_body_json_mepm_pkg_mgmt_response_list(
{ {
*, *,
mw_package_management( mw_package_management(
PX_ON_BOARDED_APP_PKG_ID, PX_ON_BOARDED_APP_PKG_ID,
PX_APP_D_ID, PX_APP_D_ID,
-, -,
-, -,
-, -,
- -
), ),
* *
} }
))))) -> value v_response { ))))) -> value v_response {
tc_ac.stop; tc_ac.stop;
log("*** " & testcasename() & ": PASS: IUT successfully responds with a Onboarded App Package list***"); log("*** " & testcasename() & ": PASS: IUT successfully responds with a Onboarded App Package list***");
...@@ -153,7 +153,7 @@ module AtsMec_PkgMgmt_mm3_TestCases { ...@@ -153,7 +153,7 @@ module AtsMec_PkgMgmt_mm3_TestCases {
/** /**
* @desc: Check that MEPM returns the an App Package when requested * @desc: Check that MEPM returns the an App Package when requested
* ETSI GS MEC 010-2 2.0.10, clause 7.4.2.3.2 * ETSI GS MEC 010-2 2.0.10, clause 7.4.2.3.2
* ETSI GS MEC 010-2 2.0.10, Table 6.2.3.3.2-1 //OnboardedAppPkgInfo * ETSI GS MEC 010-2 2.0.10, Table 6.2.3.3.2-1 //OnboardedAppPkgInfo
*/ */
testcase TP_MEC_MEPM_PKGM_002_OK() runs on HttpComponent system HttpTestAdapter { testcase TP_MEC_MEPM_PKGM_002_OK() runs on HttpComponent system HttpTestAdapter {
// Local variables // Local variables
...@@ -185,16 +185,16 @@ module AtsMec_PkgMgmt_mm3_TestCases { ...@@ -185,16 +185,16 @@ module AtsMec_PkgMgmt_mm3_TestCases {
alt { alt {
[] httpPort.receive( [] httpPort.receive(
mw_http_response( mw_http_response(
mw_http_response_ok( mw_http_response_ok(
mw_http_message_body_json( mw_http_message_body_json(
mw_body_json_mepm_pkg_mgmt_response( mw_body_json_mepm_pkg_mgmt_response(
mw_package_management( mw_package_management(
PX_ON_BOARDED_APP_PKG_ID, PX_ON_BOARDED_APP_PKG_ID,
-, -, -, -, -, - -, -, -, -, -, -
) )
) )
) )
) )
)) -> value v_response { )) -> value v_response {
tc_ac.stop; tc_ac.stop;
log("*** " & testcasename() & ": PASS: IUT successfully responds with an Onboarded App Package info and 200 status code ***"); log("*** " & testcasename() & ": PASS: IUT successfully responds with an Onboarded App Package info and 200 status code ***");
...@@ -210,7 +210,7 @@ module AtsMec_PkgMgmt_mm3_TestCases { ...@@ -210,7 +210,7 @@ module AtsMec_PkgMgmt_mm3_TestCases {
/** /**
* @desc: Check that MEPM responds with an error when it receives * @desc: Check that MEPM responds with an error when it receives
* a request for returning a App Package referred with a wrong ID * a request for returning a App Package referred with a wrong ID
* @see: ETSI GS MEC 010-2 2.0.10, clause 7.4.2.3.2 * @see: ETSI GS MEC 010-2 2.0.10, clause 7.4.2.3.2
*/ */
testcase TP_MEC_MEPM_PKGM_002_NF() runs on HttpComponent system HttpTestAdapter { testcase TP_MEC_MEPM_PKGM_002_NF() runs on HttpComponent system HttpTestAdapter {
...@@ -295,7 +295,7 @@ module AtsMec_PkgMgmt_mm3_TestCases { ...@@ -295,7 +295,7 @@ module AtsMec_PkgMgmt_mm3_TestCases {
mw_http_response( mw_http_response(
mw_http_response_ok( mw_http_response_ok(
//@TODO: How to check if a file is present in the body? //@TODO: How to check if a file is present in the body?
))) -> value v_response { ))) -> value v_response {
tc_ac.stop; tc_ac.stop;
log("*** " & testcasename() & ": PASS: IUT successfully responds with the app descriptor contained in the app pkg ***"); log("*** " & testcasename() & ": PASS: IUT successfully responds with the app descriptor contained in the app pkg ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_success); f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
...@@ -308,9 +308,9 @@ module AtsMec_PkgMgmt_mm3_TestCases { ...@@ -308,9 +308,9 @@ module AtsMec_PkgMgmt_mm3_TestCases {
} // End of testcase TP_MEC_MEPM_PKGM_003_OK } // End of testcase TP_MEC_MEPM_PKGM_003_OK
/** /**
* @desc: Check that MEPM responds with an error when it receives * @desc: Check that MEPM responds with an error when it receives
* a request for returning a App Descriptor referred with a wrong App Package ID * a request for returning a App Descriptor referred with a wrong App Package ID
* @see: ETSI GS MEC 010-2 2.0.10, clause 7.4.4.3.2 * @see: ETSI GS MEC 010-2 2.0.10, clause 7.4.4.3.2
*/ */
testcase TP_MEC_MEPM_PKGM_003_NF() runs on HttpComponent system HttpTestAdapter { testcase TP_MEC_MEPM_PKGM_003_NF() runs on HttpComponent system HttpTestAdapter {
...@@ -394,7 +394,7 @@ module AtsMec_PkgMgmt_mm3_TestCases { ...@@ -394,7 +394,7 @@ module AtsMec_PkgMgmt_mm3_TestCases {
mw_http_response( mw_http_response(
mw_http_response_ok( mw_http_response_ok(
//@TODO: How to check if a file is present in the body? //@TODO: How to check if a file is present in the body?
))) -> value v_response { ))) -> value v_response {
tc_ac.stop; tc_ac.stop;
log("*** " & testcasename() & ": PASS: IUT successfully responds with and APP Descriptor and a 200 ok status code ***"); log("*** " & testcasename() & ": PASS: IUT successfully responds with and APP Descriptor and a 200 ok status code ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_success); f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
...@@ -406,9 +406,9 @@ module AtsMec_PkgMgmt_mm3_TestCases { ...@@ -406,9 +406,9 @@ module AtsMec_PkgMgmt_mm3_TestCases {
} // End of 'alt' statement } // End of 'alt' statement
} // End of testcase TP_MEC_MEPM_PKGM_004_OK } // End of testcase TP_MEC_MEPM_PKGM_004_OK
/** /**
* @desc: Check that MEPM responds with an error when it receives * @desc: Check that MEPM responds with an error when it receives
* a request for returning a App Descriptor referred with a wrong App Package ID * a request for returning a App Descriptor referred with a wrong App Package ID
* @see: ETSI GS MEC 010-2 2.0.10, clause 7.4.4.3.2 * @see: ETSI GS MEC 010-2 2.0.10, clause 7.4.4.3.2
*/ */
testcase TP_MEC_MEPM_PKGM_004_NF() runs on HttpComponent system HttpTestAdapter { testcase TP_MEC_MEPM_PKGM_004_NF() runs on HttpComponent system HttpTestAdapter {
...@@ -459,7 +459,7 @@ module AtsMec_PkgMgmt_mm3_TestCases { ...@@ -459,7 +459,7 @@ module AtsMec_PkgMgmt_mm3_TestCases {
group pkg_mgmt_subscriptions { group pkg_mgmt_subscriptions {
/** /**
* @desc: Check that MEPM service returns an application package subscription when requested * @desc: Check that MEPM service returns an application package subscription when requested
* ETSI GS MEC 010-2 2.0.10, clause 7.4.5.3.1 * ETSI GS MEC 010-2 2.0.10, clause 7.4.5.3.1
*/ */
...@@ -486,12 +486,12 @@ group pkg_mgmt_subscriptions { ...@@ -486,12 +486,12 @@ group pkg_mgmt_subscriptions {
"/" & PICS_ROOT_API & PX_MEPM_PKGM_SUBS, "/" & PICS_ROOT_API & PX_MEPM_PKGM_SUBS,
v_headers, v_headers,
m_http_message_body_json( m_http_message_body_json(
m_body_json_mepm_pkgm_subscription( m_body_json_mepm_pkgm_subscription(
m_app_package_subscription( m_app_package_subscription(
PX_CALLBACK_URI, PX_CALLBACK_URI,
PX_SUBSCRIPTION_TYPE PX_SUBSCRIPTION_TYPE
) )
) )
) )
) )
)); ));
...@@ -506,11 +506,11 @@ group pkg_mgmt_subscriptions { ...@@ -506,11 +506,11 @@ group pkg_mgmt_subscriptions {
mw_http_response_ok( mw_http_response_ok(
mw_http_message_body_json( mw_http_message_body_json(
mw_body_json_mepm_pkgm_subscription_info( mw_body_json_mepm_pkgm_subscription_info(
mw_app_package_subscription_info( mw_app_package_subscription_info(
-,