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.
## 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 7159 - The JavaScript Object Notation (JSON) Data Interchange Format, accessible [here](https://tools.ietf.org/html/rfc7159.html)
......
......@@ -56,6 +56,7 @@ 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();
......
......@@ -17,8 +17,7 @@ namespace LibMec__Functions {
* @return Timestamp - current time since 01/01/2004 in milliseconds
* @see fx_getCurrentTime() return TimestampIts
*/
INTEGER fx__getCurrentTime(
) {
INTEGER fx__getCurrentTime() {
INTEGER i;
i.set_long_long_val(base_time::get_instance().get_its_current_time_ms());
loggers::get_instance().log_msg("<<< fx__getCurrentTime: ", i);
......@@ -35,4 +34,12 @@ namespace LibMec__Functions {
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
......@@ -49,6 +49,7 @@ LogEventTypes:= Yes
[TESTPORT_PARAMETERS]
# 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.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)"
[DEFINE]
......@@ -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_PF
# ETSI GS MEC 013
#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
#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_BR
......@@ -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_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_012_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_011_BR
......
......@@ -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
......
......@@ -134,27 +134,7 @@ do
fi
cp ${TTCN_3_ORG_PATH}/$i/*.ttcn ${TTCN_3_DST_PATH}/$i/ttcn
# Update files
if [ "$i" == "LibMec" ]
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" ]
if [ "$i" == "LibHttp" ]
then
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
......@@ -169,6 +149,14 @@ do
cp ${TTCN_3_ORG_PATH}/$i/ttcn/*.ttcn ${TTCN_3_DST_PATH}/$i/ttcn
# Patch TITAN due to TTCN-3 compiler issues
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
done
......
......@@ -1246,8 +1246,7 @@
alt {
[] httpPort.receive(
mw_http_response(
mw_http_response_204_no_content(
)
mw_http_response_204_no_content
)
)
{
......
......@@ -1626,7 +1626,7 @@ module AtsMec_AppEnablementAPI_TestCases {
alt {
[] httpPort.receive(
mw_http_response(
mw_http_response_412_precondition_failed()
mw_http_response_412_precondition_failed
)) {
tc_ac.stop;
......
......@@ -361,8 +361,8 @@ module AtsMec_AppLCM_TestCases {
alt {
[] httpPort.receive(
mw_http_response(
mw_http_response_204_no_content(
))) -> value v_response {
mw_http_response_204_no_content
)) -> value v_response {
tc_ac.stop;
log("*** " & testcasename() & ": PASS: IUT successfully responds with a 204 no content status code ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
......@@ -1471,7 +1471,7 @@ group app_lcm_subscriptions {
alt {
[] httpPort.receive(
mw_http_response(
mw_http_response_204_no_content()
mw_http_response_204_no_content
)) -> value v_response {
tc_ac.stop;
......@@ -1576,7 +1576,7 @@ group app_lcm__notification {
[] httpPort_notif.receive(
mw_http_request(
mw_http_request_post(
unichar2char(PX_CALLBACK_URI),
oct2char(unichar2oct(PX_CALLBACK_URI)),
-,
mw_http_message_body_json(
mw_body_json_lcm_notification(
......
......@@ -177,7 +177,7 @@ module AtsMec_LocationAPI_TestCases {
httpPort.send(
m_http_request(
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
)
)
......@@ -259,7 +259,7 @@ module AtsMec_LocationAPI_TestCases {
mw_http_response_201_created(
mw_http_message_body_json(
mw_body_json_user_tracking_subscription(
mw_user_tracking_subscription_response(
mw_user_tracking_subscription(
PX_CLIENT_ID,
PX_CALLBACK_REF_URL,
PX_USER
......@@ -367,7 +367,7 @@ module AtsMec_LocationAPI_TestCases {
httpPort.send(
m_http_request(
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
)
)
......@@ -421,7 +421,7 @@ module AtsMec_LocationAPI_TestCases {
httpPort.send(
m_http_request(
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
)
)
......@@ -479,7 +479,7 @@ module AtsMec_LocationAPI_TestCases {
httpPort.send(
m_http_request(
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
)
)
......@@ -494,7 +494,7 @@ module AtsMec_LocationAPI_TestCases {
mw_http_response_201_created(
mw_http_message_body_json(
mw_body_json_user_tracking_subscription(
mw_user_tracking_subscription_response(
mw_user_tracking_subscription(
PX_CLIENT_ID,
PX_CALLBACK_REF_URL,
PX_USER
......@@ -602,7 +602,7 @@ module AtsMec_LocationAPI_TestCases {
httpPort.send(
m_http_request(
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
)
)
......@@ -656,7 +656,7 @@ module AtsMec_LocationAPI_TestCases {
httpPort.send(
m_http_request(
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
)
)
......@@ -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
)
)
......
......@@ -1213,7 +1213,7 @@ group pkg_management_notification {
[] httpPort_notif.receive(
mw_http_request(
mw_http_request_post(
unichar2char(PX_CALLBACK_URI),
oct2char(unichar2oct(PX_CALLBACK_URI)),
-,
mw_http_message_body_json(
mw_body_json_app_package_notification(
......
......@@ -890,7 +890,7 @@ group mepm_pkg_management_notification {
[] httpPort_notif.receive(
mw_http_request(
mw_http_request_post(
unichar2char(PX_CALLBACK_URI),
oct2char(unichar2oct(PX_CALLBACK_URI)),
-,
mw_http_message_body_json(
mw_body_json_mepm_app_package_notification(
......
......@@ -116,7 +116,21 @@ module AtsMec_TestControl {
}
if (PICS_BWMANAGEMENT_API_SUPPORTED) {
execute(TC_MEC_PLAT_MP1_BWA_BV_001());
execute(TC_MEC_SRV_BWA_001_OK());
execute(TC_MEC_SRV_BWA_001_BR());
execute(TC_MEC_SRV_BWA_002_OK());
execute(TC_MEC_SRV_BWA_002_BR());
execute(TC_MEC_SRV_BWA_003_OK());
execute(TC_MEC_SRV_BWA_003_NF());
execute(TC_MEC_SRV_BWA_004_OK());
execute(TC_MEC_SRV_BWA_004_BR());
execute(TC_MEC_SRV_BWA_004_NF());
execute(TC_MEC_SRV_BWA_005_OK());
execute(TC_MEC_SRV_BWA_005_BR());
execute(TC_MEC_SRV_BWA_005_NF());
execute(TC_MEC_SRV_BWA_005_PF());
execute(TC_MEC_SRV_BWA_006_OK());
execute(TC_MEC_SRV_BWA_006_NF());
}
} // End of 'control' statement
......
LibIts @ 77f9d4cf
Subproject commit 3c0c0de3330be31a4a670518770d7ef20dacf245
Subproject commit 77f9d4cf66a865cf5809503bc3e1f1039fe750cd
......@@ -6,21 +6,21 @@ module Ams_Pixits {
// LibMec/LocationAPI
import from Ams_TypesAndValues all;
modulepar JSON.String PX_APP_MOBILITY_SERVICE_ID := "KtRGymNQ84dG3mQfRepa"
modulepar JSON.String PX_APP_MOBILITY_SERVICE_ID := "KtRGymNQ84dG3mQfRepa";
modulepar JSON.String PX_APP_INS_ID := "5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f"
modulepar JSON.String PX_APP_INS_ID := "5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f";
modulepar SubscriptionType PX_SUBSCRIPTION_TYPE := MobilityProcedureSubscription
modulepar SubscriptionType PX_SUBSCRIPTION_TYPE := MobilityProcedureSubscription;
modulepar JSON.String PX_SUBSCRIPTION_ID := "e0deee2b-6e50-4f33-ab09-8bf0585025d3"
modulepar JSON.String PX_SUBSCRIPTION_ID := "e0deee2b-6e50-4f33-ab09-8bf0585025d3";
modulepar JSON.String PX_NON_EXISTENT_SUBSCRIPTION_ID := "NON_EXISTENT_SUBSCRIPTION_ID"
modulepar JSON.String PX_NON_EXISTENT_SUBSCRIPTION_ID := "NON_EXISTENT_SUBSCRIPTION_ID";
modulepar JSON.String PX_NON_EXISTENT_APP_MOBILITY_SERVICE_ID := "PX_NON_EXISTENT_APP_MOBILITY_SERVICE_ID"
modulepar JSON.String PX_NON_EXISTENT_APP_MOBILITY_SERVICE_ID := "PX_NON_EXISTENT_APP_MOBILITY_SERVICE_ID";
modulepar JSON.String PX_CALLBACK_REFERENCE := "http://127.0.0.1/callback"
modulepar JSON.String PX_CALLBACK_REFERENCE := "http://127.0.0.1/callback";
modulepar charstring PX_CALLBACK_URI := "http://127.0.0.1/callback"
modulepar charstring PX_CALLBACK_URI := "http://127.0.0.1/callback";
modulepar JSON.String PX_MEP_ID := "";
......
......@@ -174,7 +174,7 @@ module Ams_Templates {
Subscription subscription
}
template (value) AdjacentAppInfoSubscription mw_adjacent_application_info_notification (
template (value) AdjacentAppInfoSubscription_ mw_adjacent_application_info_notification (
in template (omit) SubscriptionType p_subscriptionType := omit,
in JSON.AnyURI p_callbackReference,
in template (omit) JSON.AnyURI p_links := omit,
......@@ -190,7 +190,7 @@ module Ams_Templates {
}
template (value) MobilityProcedureSubscription m_ams_subscription (
template (value) MobilityProcedureSubscription_ m_ams_subscription (
in SubscriptionType p_subscriptionType := PX_SUBSCRIPTION_TYPE,
in JSON.AnyURI p_callbackReference,
in template (omit) JSON.AnyURI p_links := omit,
......@@ -207,7 +207,7 @@ module Ams_Templates {
template (value) MobilityProcedureSubscription mw_mobility_procedure_notification (
template (value) MobilityProcedureSubscription_ mw_mobility_procedure_notification (
in template (omit) SubscriptionType p_subscriptionType := omit,
in JSON.AnyURI p_callbackReference,
in template (omit) JSON.AnyURI p_links := omit,
......@@ -237,7 +237,7 @@ module Ams_Templates {
expiryDeadline := p_expiryDeadline
}
template (present) MobilityProcedureSubscription mw_ams_subscription (
template (present) MobilityProcedureSubscription_ mw_ams_subscription (
in SubscriptionType p_subscriptionType,
in template (omit) JSON.AnyURI p_callbackReference := omit,
in template (omit) JSON.AnyURI p_links := omit,
......
......@@ -90,8 +90,8 @@ type record MobilityProcedureSubscriptionError {
type record of MobilityProcedureSubscription MobilityProcedureSubscriptions;
type record MobilityProcedureSubscription {
type record of MobilityProcedureSubscription_ MobilityProcedureSubscriptions;
type record MobilityProcedureSubscription_ {
SubscriptionType subscriptionType,
JSON.AnyURI callbackReference,
JSON.AnyURI links optional,
......@@ -132,8 +132,8 @@ type record ExpiryNotification {
TimeStamp expiryDeadline
}
type record of AdjacentAppInfoSubscription AdjacentAppInfoSubscriptions;
type record AdjacentAppInfoSubscription {
type record of AdjacentAppInfoSubscription_ AdjacentAppInfoSubscriptions;
type record AdjacentAppInfoSubscription_ {
SubscriptionType subscriptionType,
JSON.AnyURI callbackReference,
JSON.AnyURI links optional,
......
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