February 2025 - gerrit-log - lists.osmocom.org

[XS] Change in libosmocore[master]: gsmtap: fix outdated header version in comment

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/libosmocore/+/39540?usp=email ) Change subject: gsmtap: fix outdated header version in comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/39540?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iee4cbd5f8699ed7da28a0f9ac5856b435e76b86a Gerrit-Change-Number: 39540 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 14 Feb 2025 13:53:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 3 weeks

1
0
0 0

[S] Change in ...osmo-s1gw[master]: erab_fsm: make erab_release_{cmd,ind}/1 non-blocking

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39523?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: erab_fsm: make erab_release_{cmd,ind}/1 non-blocking ...................................................................... erab_fsm: make erab_release_{cmd,ind}/1 non-blocking There's no practical benefit(s) in blocking the caller while waiting for the PFCP Session Deletion Response from the UPF. The response does not contain any useful information for the caller. Make the release related API non-blocking by using gen_statem:cast/2 instead of gen_statem:call/2. Adjust state functions to not reply. Change-Id: If519334359c3ef331720cb87bdba2d969601816e Related: SYS#7318 --- M src/erab_fsm.erl M test/erab_fsm_test.erl 2 files changed, 15 insertions(+), 27 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index 9ee9abe..bbb6dad 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -136,7 +136,7 @@ -spec erab_release_cmd(pid()) -> ok. erab_release_cmd(Pid) -> - gen_statem:call(Pid, ?FUNCTION_NAME). + gen_statem:cast(Pid, ?FUNCTION_NAME). -spec erab_release_rsp(pid()) -> ok. @@ -146,7 +146,7 @@ -spec erab_release_ind(pid()) -> ok. erab_release_ind(Pid) -> - gen_statem:call(Pid, ?FUNCTION_NAME). + gen_statem:cast(Pid, ?FUNCTION_NAME). -spec fetch_info(pid()) -> proplists:proplist(). @@ -305,21 +305,17 @@ ?LOG_DEBUG("State change: ~p -> ~p", [OldState, ?FUNCTION_NAME]), {keep_state, S}; -erab_setup({call, From}, - erab_release_cmd, +erab_setup(cast, erab_release_cmd, #erab_state{} = S) -> ?LOG_DEBUG("Rx E-RAB RELEASE Cmd"), {next_state, session_delete, - S#erab_state{from = From, - rel_kind = cmd}}; + S#erab_state{rel_kind = cmd}}; -erab_setup({call, From}, - erab_release_ind, +erab_setup(cast, erab_release_ind, #erab_state{} = S) -> ?LOG_DEBUG("Rx E-RAB RELEASE Ind"), {next_state, session_delete, - S#erab_state{from = From, - rel_kind = ind}}; + S#erab_state{rel_kind = ind}}; erab_setup(Event, EventData, S) -> handle_event(?FUNCTION_NAME, Event, EventData, S). @@ -335,36 +331,27 @@ S#erab_state{seid_rem = undefined}, [{state_timeout, ?ERAB_T_SESSION_DELETE, ?FUNCTION_NAME}]}; -session_delete(state_timeout, _Timeout, - #erab_state{from = From}) -> +session_delete(state_timeout, _Timeout, _S) -> ?LOG_ERROR("PFCP session deletion timeout"), - {stop_and_reply, - {shutdown, timeout}, - {reply, From, {error, {timeout, ?FUNCTION_NAME}}}}; + {stop, {shutdown, timeout}}; session_delete(info, #pfcp{} = PDU, - #erab_state{from = From, - seid_loc = SEID_Rsp, + #erab_state{seid_loc = SEID_Rsp, rel_kind = RelKind} = S) -> case PDU of #pfcp{type = session_deletion_response, seid = SEID_Rsp, %% matches F-SEID we sent in the ESTABLISH Req ie = #{pfcp_cause := 'Request accepted'}} -> ?LOG_DEBUG("PFCP session deleted"), - Reply = {reply, From, ok}, case RelKind of cmd -> %% E-RAB RELEASE CMD => wait for the RSP - {next_state, erab_wait_release_rsp, - S#erab_state{from = undefined}, - [Reply]}; + {next_state, erab_wait_release_rsp, S}; ind -> %% E-RAB RELEASE IND => terminate immediately - {stop_and_reply, normal, [Reply]} + {stop, normal} end; _ -> ?LOG_ERROR("Rx unexpected PFCP PDU: ~p", [PDU]), - {stop_and_reply, - {shutdown, unexp_pdu}, - {reply, From, {error, {unexp_pdu, ?FUNCTION_NAME}}}} + {stop, {shutdown, unexp_pdu}} end; session_delete(Event, EventData, S) -> diff --git a/test/erab_fsm_test.erl b/test/erab_fsm_test.erl index e406e88..ec40e2e 100644 --- a/test/erab_fsm_test.erl +++ b/test/erab_fsm_test.erl @@ -125,10 +125,11 @@ PDU = pfcp_mock:pdu_rsp_reject(session_deletion_response, ?SEID_Loc), pfcp_mock:mock_req(session_delete_req, PDU), unlink(Pid), %% we expect the FSM to terminate abnormally - Error = {unexp_pdu, session_delete}, [?_assertEqual({ok, ?A2U}, erab_fsm:erab_setup_req(Pid, ?U2C)), ?_assertEqual({ok, ?C2U}, erab_fsm:erab_setup_rsp(Pid, ?U2A)), - ?_assertEqual({error, Error}, erab_fsm:erab_release_cmd(Pid)), + %% erab_fsm:erab_release_cmd/1 is non-blocking, + %% so we get ok before the error happens + ?_assertEqual(ok, erab_fsm:erab_release_cmd(Pid)), ?_assertNot(erlang:is_process_alive(Pid))]. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39523?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: If519334359c3ef331720cb87bdba2d969601816e Gerrit-Change-Number: 39523 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 months, 3 weeks

1
0
0 0

[S] Change in ...osmo-s1gw[master]: erab_fsm: handle RELEASE.{cmd,ind} in state erab_wait_setup_rsp

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39524?usp=email ) Change subject: erab_fsm: handle RELEASE.{cmd,ind} in state erab_wait_setup_rsp ...................................................................... erab_fsm: handle RELEASE.{cmd,ind} in state erab_wait_setup_rsp It can happen that either the eNB or the MME orders E-RAB release (directly or indirectly via UE CONTEXT RELEASE) *before* the E-RAB is fully setup (i.e. the erab_fsm state =/= erab_setup). Change-Id: I91a010f304456c1593ef257051a912f0fe8ae2a1 Related: SYS#7318, SYS#7310 --- M src/erab_fsm.erl M test/erab_fsm_test.erl 2 files changed, 39 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index bbb6dad..c4dbbd6 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -260,6 +260,18 @@ S#erab_state{from = From, u2a = U2A}}; +erab_wait_setup_rsp(cast, erab_release_cmd, + #erab_state{} = S) -> + ?LOG_DEBUG("Rx E-RAB RELEASE Cmd"), + {next_state, session_delete, + S#erab_state{rel_kind = cmd}}; + +erab_wait_setup_rsp(cast, erab_release_ind, + #erab_state{} = S) -> + ?LOG_DEBUG("Rx E-RAB RELEASE Ind"), + {next_state, session_delete, + S#erab_state{rel_kind = ind}}; + erab_wait_setup_rsp(Event, EventData, S) -> handle_event(?FUNCTION_NAME, Event, EventData, S). diff --git a/test/erab_fsm_test.erl b/test/erab_fsm_test.erl index ec40e2e..232446e 100644 --- a/test/erab_fsm_test.erl +++ b/test/erab_fsm_test.erl @@ -49,10 +49,14 @@ erab_release_test_() -> - [{"E-RAB RELEASE CMD :: success", - ?TC(fun test_erab_release_cmd_success/1)}, - {"E-RAB RELEASE IND :: success", - ?TC(fun test_erab_release_ind_success/1)}, + [{"E-RAB RELEASE CMD (in state erab_setup) :: success", + ?TC(fun test_erab_setup_release_cmd_success/1)}, + {"E-RAB RELEASE CMD (in state erab_wait_setup_rsp) :: success", + ?TC(fun test_erab_wait_setup_rsp_release_cmd_success/1)}, + {"E-RAB RELEASE IND (in state erab_setup) :: success", + ?TC(fun test_erab_setup_release_ind_success/1)}, + {"E-RAB RELEASE IND (in state erab_wait_setup_rsp) :: success", + ?TC(fun test_erab_wait_setup_rsp_release_ind_success/1)}, {"E-RAB release :: PFCP session deletion error", ?TC(fun test_erab_release_pfcp_delete_error/1)}]. @@ -105,7 +109,8 @@ ?_assertNot(erlang:is_process_alive(Pid))]. -test_erab_release_cmd_success(Pid) -> +%% test E-RAB RELEASE.{cmd,rsp} received in state erab_setup +test_erab_setup_release_cmd_success(Pid) -> [?_assertEqual({ok, ?A2U}, erab_fsm:erab_setup_req(Pid, ?U2C)), ?_assertEqual({ok, ?C2U}, erab_fsm:erab_setup_rsp(Pid, ?U2A)), ?_assertEqual(ok, erab_fsm:erab_release_cmd(Pid)), @@ -113,13 +118,29 @@ ?_assertNot(erlang:is_process_alive(Pid))]. -test_erab_release_ind_success(Pid) -> +%% test E-RAB RELEASE.{cmd,rsp} received in state erab_wait_setup_rsp +test_erab_wait_setup_rsp_release_cmd_success(Pid) -> + [?_assertEqual({ok, ?A2U}, erab_fsm:erab_setup_req(Pid, ?U2C)), + ?_assertEqual(ok, erab_fsm:erab_release_cmd(Pid)), + ?_assertEqual(ok, erab_fsm:erab_release_rsp(Pid)), + ?_assertNot(erlang:is_process_alive(Pid))]. + + +%% test E-RAB RELEASE.ind received in state erab_setup +test_erab_setup_release_ind_success(Pid) -> [?_assertEqual({ok, ?A2U}, erab_fsm:erab_setup_req(Pid, ?U2C)), ?_assertEqual({ok, ?C2U}, erab_fsm:erab_setup_rsp(Pid, ?U2A)), ?_assertEqual(ok, erab_fsm:erab_release_ind(Pid)), ?_assertNot(erlang:is_process_alive(Pid))]. +%% test E-RAB RELEASE.ind received in state erab_wait_setup_rsp +test_erab_wait_setup_rsp_release_ind_success(Pid) -> + [?_assertEqual({ok, ?A2U}, erab_fsm:erab_setup_req(Pid, ?U2C)), + ?_assertEqual(ok, erab_fsm:erab_release_ind(Pid)), + ?_assertNot(erlang:is_process_alive(Pid))]. + + test_erab_release_pfcp_delete_error(Pid) -> %% pfcp_peer:session_delete_req/1 responds with a reject PDU = pfcp_mock:pdu_rsp_reject(session_deletion_response, ?SEID_Loc), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39524?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I91a010f304456c1593ef257051a912f0fe8ae2a1 Gerrit-Change-Number: 39524 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 months, 3 weeks

1
0
0 0

[S] Change in ...osmo-s1gw[master]: erab_fsm: handle RELEASE.ind in state erab_wait_release_rsp

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39525?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: erab_fsm: handle RELEASE.ind in state erab_wait_release_rsp ...................................................................... erab_fsm: handle RELEASE.ind in state erab_wait_release_rsp This can happen if both MME and eNB initiate the E-RAB RELEASE procedures simultaneously. Ignore subsequent release requests. Change-Id: I68efecf56866e04c71571165f61648d9c37fc173 Related: SYS#7318, SYS#7310 --- M src/erab_fsm.erl M test/erab_fsm_test.erl 2 files changed, 22 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index c4dbbd6..dbd7ec1 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -385,6 +385,16 @@ ?LOG_DEBUG("Rx E-RAB RELEASE Rsp, we're done"), {stop, normal}; %% we're done! +erab_wait_release_rsp(cast, erab_release_cmd, + #erab_state{}) -> + ?LOG_INFO("Rx E-RAB RELEASE Cmd while releasing (ignored)"), + keep_state_and_data; + +erab_wait_release_rsp(cast, erab_release_ind, + #erab_state{}) -> + ?LOG_INFO("Rx E-RAB RELEASE Ind while releasing (ignored)"), + keep_state_and_data; + erab_wait_release_rsp(Event, EventData, S) -> handle_event(?FUNCTION_NAME, Event, EventData, S). diff --git a/test/erab_fsm_test.erl b/test/erab_fsm_test.erl index 232446e..ea508dd 100644 --- a/test/erab_fsm_test.erl +++ b/test/erab_fsm_test.erl @@ -57,6 +57,8 @@ ?TC(fun test_erab_setup_release_ind_success/1)}, {"E-RAB RELEASE IND (in state erab_wait_setup_rsp) :: success", ?TC(fun test_erab_wait_setup_rsp_release_ind_success/1)}, + {"E-RAB RELEASE IND (in state erab_wait_release_rsp) :: success", + ?TC(fun test_erab_wait_release_rsp_release_ind_success/1)}, {"E-RAB release :: PFCP session deletion error", ?TC(fun test_erab_release_pfcp_delete_error/1)}]. @@ -141,6 +143,16 @@ ?_assertNot(erlang:is_process_alive(Pid))]. +%% test E-RAB RELEASE.ind received in state erab_wait_release_rsp +test_erab_wait_release_rsp_release_ind_success(Pid) -> + [?_assertEqual({ok, ?A2U}, erab_fsm:erab_setup_req(Pid, ?U2C)), + ?_assertEqual({ok, ?C2U}, erab_fsm:erab_setup_rsp(Pid, ?U2A)), + ?_assertEqual(ok, erab_fsm:erab_release_cmd(Pid)), + ?_assertEqual(ok, erab_fsm:erab_release_ind(Pid)), %% ignored + ?_assertEqual(ok, erab_fsm:erab_release_rsp(Pid)), + ?_assertNot(erlang:is_process_alive(Pid))]. + + test_erab_release_pfcp_delete_error(Pid) -> %% pfcp_peer:session_delete_req/1 responds with a reject PDU = pfcp_mock:pdu_rsp_reject(session_deletion_response, ?SEID_Loc), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39525?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I68efecf56866e04c71571165f61648d9c37fc173 Gerrit-Change-Number: 39525 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 months, 3 weeks

1
0
0 0

[M] Change in ...osmo-s1gw[master]: erab_fsm: implement E-RAB MODIFY Req/Rsp procedure

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39116?usp=email ) Change subject: erab_fsm: implement E-RAB MODIFY Req/Rsp procedure ...................................................................... erab_fsm: implement E-RAB MODIFY Req/Rsp procedure The MME-initiated E-RAB modification procedure is defined in 3GPP TS 36.413 section 8.2.2. Change-Id: I24d57ea390d71b640cb42046a8658e9d30670682 --- M src/erab_fsm.erl M test/erab_fsm_test.erl M test/pfcp_mock.hrl 3 files changed, 159 insertions(+), 12 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index dbd7ec1..6713388 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -49,6 +49,8 @@ -export([start_link/1, erab_setup_req/2, erab_setup_rsp/2, + erab_modify_req/2, + erab_modify_rsp/2, erab_release/2, erab_release_cmd/1, erab_release_rsp/1, @@ -73,6 +75,9 @@ addr() %% GTP-U Transport Layer Address }. +-type mod_kind() :: setup_rsp | + modify_req | + modify_rsp_nack. -type rel_kind() :: cmd | ind. -record(erab_state, {uid :: term(), %% unique E-RAB identifier @@ -81,8 +86,10 @@ c2u :: undefined | teid_addr(), %% GTP-U params for UPF <- Core a2u :: undefined | teid_addr(), %% GTP-U params for UPF <- Access u2a :: undefined | teid_addr(), %% GTP-U params for UPF -> Access + u2cm :: undefined | teid_addr(), %% GTP-U params for UPF -> Core (modified) seid_loc :: undefined | pfcp_peer:pfcp_seid(), %% local SEID, chosen by us seid_rem :: undefined | pfcp_peer:pfcp_seid(), %% remote SEID, chosen by the UPF + mod_kind :: undefined | mod_kind(), %% E-RAB MODIFY kind rel_kind :: undefined | rel_kind() %% E-RAB RELEASE kind }). @@ -127,6 +134,28 @@ gen_statem:call(Pid, {?FUNCTION_NAME, F_TEID}). +%% @doc Indicate reception of E-RAB modify request (from core). +%% @param Pid PID of an erab_fsm. +%% @param F_TEID TEID and bind address indicated by the MME. +%% @returns TEID and Addr to be sent to the eNB; an error otherwise. +%% @end +-spec erab_modify_req(pid(), teid_addr()) -> {ok, teid_addr()} | + {error, term()}. +erab_modify_req(Pid, F_TEID) -> + gen_statem:call(Pid, {?FUNCTION_NAME, F_TEID}). + + +%% @doc Indicate reception of E-RAB modify response (from access). +%% @param Pid PID of an erab_fsm. +%% @param Res ack if eNB indicates successful modification; +%% nack if eNB indicates unsuccessful modification. +%% @returns ok or an error. +%% @end +-spec erab_modify_rsp(pid(), ack | nack) -> ok | {error, term()}. +erab_modify_rsp(Pid, Res) -> + gen_statem:call(Pid, {?FUNCTION_NAME, Res}). + + -spec erab_release(pid(), rel_kind()) -> ok. erab_release(Pid, cmd) -> erab_release_cmd(Pid); @@ -257,7 +286,8 @@ #erab_state{} = S) -> ?LOG_DEBUG("Rx E-RAB SETUP Rsp (U2A ~s)", [pp(U2A)]), {next_state, session_modify, - S#erab_state{from = From, + S#erab_state{mod_kind = setup_rsp, + from = From, u2a = U2A}}; erab_wait_setup_rsp(cast, erab_release_cmd, @@ -293,13 +323,22 @@ session_modify(info, #pfcp{type = session_modification_response, seid = SEID_Rsp, %% matches F-SEID we sent in the ESTABLISH Req ie = #{pfcp_cause := 'Request accepted'}}, - #erab_state{from = From, - seid_loc = SEID_Rsp, - c2u = C2U} = S) -> + #erab_state{mod_kind = ModKind, + from = From, + seid_loc = SEID_Rsp} = S) -> ?LOG_DEBUG("PFCP session modified"), + Reply = case ModKind of + setup_rsp -> + {ok, S#erab_state.c2u}; + modify_req -> + {ok, S#erab_state.a2u}; + modify_rsp_nack -> + ok + end, {next_state, erab_setup, - S#erab_state{from = undefined}, - [{reply, From, {ok, C2U}}]}; + S#erab_state{mod_kind = undefined, + from = undefined}, + [{reply, From, Reply}]}; session_modify(info, #pfcp{} = PDU, #erab_state{from = From}) -> @@ -317,6 +356,41 @@ ?LOG_DEBUG("State change: ~p -> ~p", [OldState, ?FUNCTION_NAME]), {keep_state, S}; +erab_setup({call, From}, + {erab_modify_req, U2CM}, + #erab_state{} = S) -> + ?LOG_DEBUG("Rx E-RAB MODIFY Req (U2CM ~p)", [U2CM]), + {next_state, session_modify, + S#erab_state{mod_kind = modify_req, + from = From, + u2cm = U2CM}}; + +erab_setup({call, From}, + {erab_modify_rsp, Res}, + #erab_state{u2cm = undefined}) -> + %% Ignore erab_modify_rsp events without prior erab_modify_req. This happens + %% when the S1AP E-RAB MODIFY Req contains no F-TEID (nothing to modify). + ?LOG_DEBUG("Rx E-RAB MODIFY Rsp (~p), F-TEID remains unchanged", [Res]), + {keep_state_and_data, {reply, From, ok}}; + +erab_setup({call, From}, + {erab_modify_rsp, Res}, + #erab_state{u2cm = U2CM} = S0) -> + ?LOG_DEBUG("Rx E-RAB MODIFY Rsp (~p)", [Res]), + case Res of + ack -> + {keep_state, + S0#erab_state{u2c = U2CM, + u2cm = undefined}, + {reply, From, ok}}; + nack -> + %% revert PFCP session params + {next_state, session_modify, + S0#erab_state{mod_kind = modify_rsp_nack, + u2cm = undefined, + from = From}} + end; + erab_setup(cast, erab_release_cmd, #erab_state{} = S) -> ?LOG_DEBUG("Rx E-RAB RELEASE Cmd"), @@ -480,19 +554,50 @@ -spec session_modify_req(erab_state()) -> pfcp_peer:pfcp_session_rsp(). -session_modify_req(#erab_state{seid_rem = SEID, %% SEID allocated to us +session_modify_req(#erab_state{mod_kind = setup_rsp, + seid_rem = SEID, u2a = U2A}) -> + %% E-RAB SETUP Rsp - eNB indicates the access side F-TEID, + %% so we modify the respective FAR (id=1), which was previously + %% set to DROP, to FORW. + session_modify_req(SEID, 1, U2A); + +session_modify_req(#erab_state{mod_kind = modify_req, + seid_rem = SEID, + u2cm = U2CM}) -> + %% E-RAB MODIFY Req - MME orders modification of U2C F-TEID, + %% so we modify the respective FAR (id=2) + session_modify_req(SEID, 2, U2CM); + +session_modify_req(#erab_state{mod_kind = modify_rsp_nack, + seid_rem = SEID, + u2c = U2C}) -> + %% E-RAB MODIFY Rsp (NACK) - eNB NACK's E-RAB modification + %% so we modify the respective FAR (id=2) + session_modify_req(SEID, 2, U2C). + + +-spec session_modify_req(SEID, FAR_ID, F_TEID) -> Result + when SEID :: pfcp_peer:pfcp_seid(), + FAR_ID :: integer(), + F_TEID :: teid_addr(), + Result :: pfcp_peer:pfcp_session_rsp(). +session_modify_req(SEID, FAR_ID, F_TEID) -> %% Forwarding Action Rules - FPars = #{outer_header_creation => ohc(U2A)}, - FParsNI = add_net_inst(FPars, 'Access'), %% optional Network Instance IE - FARs = [#{far_id => {far_id, 1}, %% -- for Core -> Access - %% Now we know the Access side TEID / GTP-U address, so we modify - %% this FAR (which was previously set to DROP) to FORW. + Iface = far_id2iface(FAR_ID), + FPars = #{outer_header_creation => ohc(F_TEID)}, + FParsNI = add_net_inst(FPars, Iface), %% optional Network Instance IE + FARs = [#{far_id => {far_id, FAR_ID}, apply_action => #{'FORW' => []}, update_forwarding_parameters => FParsNI}], pfcp_peer:session_modify_req(SEID, [], FARs). +-spec far_id2iface(integer()) -> iface(). +far_id2iface(1) -> 'Access'; +far_id2iface(2) -> 'Core'. + + %% Network Instance IE env parameter name -spec net_inst_param(iface()) -> atom(). net_inst_param('Core') -> pfcp_net_inst_core; diff --git a/test/erab_fsm_test.erl b/test/erab_fsm_test.erl index ea508dd..1a40b6d 100644 --- a/test/erab_fsm_test.erl +++ b/test/erab_fsm_test.erl @@ -8,6 +8,8 @@ -define(A2U, {?TEID_A2U, ?ADDR_A2U}). -define(U2A, {?TEID_U2A, ?ADDR_U2A}). +-define(U2CM, {?TEID_U2CM, ?ADDR_U2CM}). + %% ------------------------------------------------------------------ %% setup/misc functions %% ------------------------------------------------------------------ @@ -48,6 +50,13 @@ ?TC(fun test_erab_setup_pfcp_modify_error/1)}]. +erab_modify_test_() -> + [{"E-RAB MODIFY REQ :: ACK", + ?TC(fun test_erab_modify_req_ack/1)}, + {"E-RAB MODIFY REQ :: NACK", + ?TC(fun test_erab_modify_req_nack/1)}]. + + erab_release_test_() -> [{"E-RAB RELEASE CMD (in state erab_setup) :: success", ?TC(fun test_erab_setup_release_cmd_success/1)}, @@ -111,6 +120,35 @@ ?_assertNot(erlang:is_process_alive(Pid))]. +test_erab_modify_req(Pid, Res) -> + U2C = case Res of + ack -> ?U2CM; + nack -> ?U2C + end, + [?_assertEqual({ok, ?A2U}, erab_fsm:erab_setup_req(Pid, ?U2C)), + ?_assertEqual({ok, ?C2U}, erab_fsm:erab_setup_rsp(Pid, ?U2A)), + %% E-RAB MODIFY Req indicates the new (modified) F-TEID to be used + %% in the UPF -> Core direction. The FSM logic indicates the old + %% (unmodified) F-TEID to be used in the UPF <- Access direction. + ?_assertEqual({ok, ?A2U}, erab_fsm:erab_modify_req(Pid, ?U2CM)), + %% Before getting the Rsp, the U2C F-TEID remains unchanged + ?_assertEqual(?U2C, erab_fsm_info(Pid, f_teid_u2c)), + %% After getting the Rsp (ACK), the new (modified) U2C F-TEID is used + %% After getting the Rsp (NACK), the U2C F-TEID remains unchanged + ?_assertEqual(ok, erab_fsm:erab_modify_rsp(Pid, Res)), + ?_assertEqual(U2C, erab_fsm_info(Pid, f_teid_u2c)), + ?_assertEqual(ok, erab_fsm:shutdown(Pid)), + ?_assertNot(erlang:is_process_alive(Pid))]. + + +test_erab_modify_req_ack(Pid) -> + test_erab_modify_req(Pid, ack). + + +test_erab_modify_req_nack(Pid) -> + test_erab_modify_req(Pid, nack). + + %% test E-RAB RELEASE.{cmd,rsp} received in state erab_setup test_erab_setup_release_cmd_success(Pid) -> [?_assertEqual({ok, ?A2U}, erab_fsm:erab_setup_req(Pid, ?U2C)), diff --git a/test/pfcp_mock.hrl b/test/pfcp_mock.hrl index c044939..9a0232a 100644 --- a/test/pfcp_mock.hrl +++ b/test/pfcp_mock.hrl @@ -6,9 +6,13 @@ -define(TEID_A2U, 16#0202). %% UPF <- Access -define(TEID_U2A, 16#0002). %% UPF -> Access +-define(TEID_U2CM, 16#0f0001). %% UPF -> Core (modified) + -define(ADDR_U2C, << 16#7f, 16#00, 16#00, 16#01 >>). %% UPF -> Core -define(ADDR_C2U, << 16#7f, 16#00, 16#01, 16#01 >>). %% UPF <- Core -define(ADDR_A2U, << 16#7f, 16#00, 16#02, 16#02 >>). %% UPF <- Access -define(ADDR_U2A, << 16#7f, 16#00, 16#00, 16#02 >>). %% UPF -> Access +-define(ADDR_U2CM, << 16#7f, 16#0f, 16#00, 16#01 >>). %% UPF -> Core (modified) + %% vim:set ts=4 sw=4 et: -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39116?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I24d57ea390d71b640cb42046a8658e9d30670682 Gerrit-Change-Number: 39116 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 months, 3 weeks

1
0
0 0

[M] Change in ...osmo-s1gw[master]: erab_fsm: implement E-RAB MODIFY Ind/Cnf procedure

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39147?usp=email ) Change subject: erab_fsm: implement E-RAB MODIFY Ind/Cnf procedure ...................................................................... erab_fsm: implement E-RAB MODIFY Ind/Cnf procedure The eNB-initiated E-RAB modification procedure is defined in 3GPP TS 36.413 section 8.2.4. This is pretty much the same as the MME-initiated E-RAB modification. Change-Id: I750ada0a5a21edc8bc06d567c8000b6304966474 --- M src/erab_fsm.erl M test/erab_fsm_test.erl M test/pfcp_mock.hrl 3 files changed, 119 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index 6713388..c0fbbae 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -51,6 +51,8 @@ erab_setup_rsp/2, erab_modify_req/2, erab_modify_rsp/2, + erab_modify_ind/2, + erab_modify_cnf/2, erab_release/2, erab_release_cmd/1, erab_release_rsp/1, @@ -77,7 +79,9 @@ -type mod_kind() :: setup_rsp | modify_req | - modify_rsp_nack. + modify_rsp_nack | + modify_ind | + modify_cnf_nack. -type rel_kind() :: cmd | ind. -record(erab_state, {uid :: term(), %% unique E-RAB identifier @@ -87,6 +91,7 @@ a2u :: undefined | teid_addr(), %% GTP-U params for UPF <- Access u2a :: undefined | teid_addr(), %% GTP-U params for UPF -> Access u2cm :: undefined | teid_addr(), %% GTP-U params for UPF -> Core (modified) + u2am :: undefined | teid_addr(), %% GTP-U params for UPF -> Access (modified) seid_loc :: undefined | pfcp_peer:pfcp_seid(), %% local SEID, chosen by us seid_rem :: undefined | pfcp_peer:pfcp_seid(), %% remote SEID, chosen by the UPF mod_kind :: undefined | mod_kind(), %% E-RAB MODIFY kind @@ -156,6 +161,28 @@ gen_statem:call(Pid, {?FUNCTION_NAME, Res}). +%% @doc Indicate reception of E-RAB modify indication (from access). +%% @param Pid PID of an erab_fsm. +%% @param F_TEID TEID and bind address indicated by the eNB. +%% @returns TEID and Addr to be sent to the MME; an error otherwise. +%% @end +-spec erab_modify_ind(pid(), teid_addr()) -> {ok, teid_addr()} | + {error, term()}. +erab_modify_ind(Pid, F_TEID) -> + gen_statem:call(Pid, {?FUNCTION_NAME, F_TEID}). + + +%% @doc Indicate reception of E-RAB modify confirmation (from core). +%% @param Pid PID of an erab_fsm. +%% @param Res ack if MME indicates successful modification; +%% nack if MME indicates unsuccessful modification. +%% @returns ok or an error. +%% @end +-spec erab_modify_cnf(pid(), ack | nack) -> ok | {error, term()}. +erab_modify_cnf(Pid, Res) -> + gen_statem:call(Pid, {?FUNCTION_NAME, Res}). + + -spec erab_release(pid(), rel_kind()) -> ok. erab_release(Pid, cmd) -> erab_release_cmd(Pid); @@ -333,6 +360,10 @@ modify_req -> {ok, S#erab_state.a2u}; modify_rsp_nack -> + ok; + modify_ind -> + {ok, S#erab_state.c2u}; + modify_cnf_nack -> ok end, {next_state, erab_setup, @@ -391,6 +422,41 @@ from = From}} end; +erab_setup({call, From}, + {erab_modify_ind, U2AM}, + #erab_state{} = S) -> + ?LOG_DEBUG("Rx E-RAB MODIFY Ind (U2AM ~p)", [U2AM]), + {next_state, session_modify, + S#erab_state{mod_kind = modify_ind, + from = From, + u2am = U2AM}}; + +erab_setup({call, From}, + {erab_modify_cnf, Res}, + #erab_state{u2am = undefined}) -> + %% Ignore erab_modify_cnf events without prior erab_modify_ind. This happens + %% when the S1AP E-RAB MODIFY Ind contains no F-TEID (nothing to modify). + ?LOG_DEBUG("Rx E-RAB MODIFY Cnf (~p), F-TEID remains unchanged", [Res]), + {keep_state_and_data, {reply, From, ok}}; + +erab_setup({call, From}, + {erab_modify_cnf, Res}, + #erab_state{u2am = U2AM} = S0) -> + ?LOG_DEBUG("Rx E-RAB MODIFY Cnf (~p)", [Res]), + case Res of + ack -> + {keep_state, + S0#erab_state{u2a = U2AM, + u2am = undefined}, + {reply, From, ok}}; + nack -> + %% revert PFCP session params + {next_state, session_modify, + S0#erab_state{mod_kind = modify_cnf_nack, + u2am = undefined, + from = From}} + end; + erab_setup(cast, erab_release_cmd, #erab_state{} = S) -> ?LOG_DEBUG("Rx E-RAB RELEASE Cmd"), @@ -574,7 +640,21 @@ u2c = U2C}) -> %% E-RAB MODIFY Rsp (NACK) - eNB NACK's E-RAB modification %% so we modify the respective FAR (id=2) - session_modify_req(SEID, 2, U2C). + session_modify_req(SEID, 2, U2C); + +session_modify_req(#erab_state{mod_kind = modify_ind, + seid_rem = SEID, + u2am = U2AM}) -> + %% E-RAB MODIFY Ind - eNB orders modification of U2A F-TEID, + %% so we modify the respective FAR (id=1) + session_modify_req(SEID, 1, U2AM); + +session_modify_req(#erab_state{mod_kind = modify_cnf_nack, + seid_rem = SEID, + u2a = U2A}) -> + %% E-RAB MODIFY Cnf (NACK) - MME NACK's E-RAB modification + %% so we modify the respective FAR (id=1) + session_modify_req(SEID, 1, U2A). -spec session_modify_req(SEID, FAR_ID, F_TEID) -> Result diff --git a/test/erab_fsm_test.erl b/test/erab_fsm_test.erl index 1a40b6d..3740f9a 100644 --- a/test/erab_fsm_test.erl +++ b/test/erab_fsm_test.erl @@ -9,6 +9,7 @@ -define(U2A, {?TEID_U2A, ?ADDR_U2A}). -define(U2CM, {?TEID_U2CM, ?ADDR_U2CM}). +-define(U2AM, {?TEID_U2AM, ?ADDR_U2AM}). %% ------------------------------------------------------------------ %% setup/misc functions @@ -54,7 +55,11 @@ [{"E-RAB MODIFY REQ :: ACK", ?TC(fun test_erab_modify_req_ack/1)}, {"E-RAB MODIFY REQ :: NACK", - ?TC(fun test_erab_modify_req_nack/1)}]. + ?TC(fun test_erab_modify_req_nack/1)}, + {"E-RAB MODIFY IND :: ACK", + ?TC(fun test_erab_modify_ind_ack/1)}, + {"E-RAB MODIFY IND :: NACK", + ?TC(fun test_erab_modify_ind_nack/1)}]. erab_release_test_() -> @@ -149,6 +154,35 @@ test_erab_modify_req(Pid, nack). +test_erab_modify_ind(Pid, Res) -> + U2A = case Res of + ack -> ?U2AM; + nack -> ?U2A + end, + [?_assertEqual({ok, ?A2U}, erab_fsm:erab_setup_req(Pid, ?U2C)), + ?_assertEqual({ok, ?C2U}, erab_fsm:erab_setup_rsp(Pid, ?U2A)), + %% E-RAB MODIFY Ind indicates the new (modified) F-TEID to be used + %% in the UPF -> Access direction. The FSM logic indicates the old + %% (unmodified) F-TEID to be used in the UPF <- Core direction. + ?_assertEqual({ok, ?C2U}, erab_fsm:erab_modify_ind(Pid, ?U2AM)), + %% Before getting the Rsp, the U2C F-TEID remains unchanged + ?_assertEqual(?U2A, erab_fsm_info(Pid, f_teid_u2a)), + %% After getting the Cnf (ACK), the new (modified) U2A F-TEID is used + %% After getting the Cnf (NACK), the U2A F-TEID remains unchanged + ?_assertEqual(ok, erab_fsm:erab_modify_cnf(Pid, Res)), + ?_assertEqual(U2A, erab_fsm_info(Pid, f_teid_u2a)), + ?_assertEqual(ok, erab_fsm:shutdown(Pid)), + ?_assertNot(erlang:is_process_alive(Pid))]. + + +test_erab_modify_ind_ack(Pid) -> + test_erab_modify_ind(Pid, ack). + + +test_erab_modify_ind_nack(Pid) -> + test_erab_modify_ind(Pid, nack). + + %% test E-RAB RELEASE.{cmd,rsp} received in state erab_setup test_erab_setup_release_cmd_success(Pid) -> [?_assertEqual({ok, ?A2U}, erab_fsm:erab_setup_req(Pid, ?U2C)), diff --git a/test/pfcp_mock.hrl b/test/pfcp_mock.hrl index 9a0232a..609d5f2 100644 --- a/test/pfcp_mock.hrl +++ b/test/pfcp_mock.hrl @@ -7,6 +7,7 @@ -define(TEID_U2A, 16#0002). %% UPF -> Access -define(TEID_U2CM, 16#0f0001). %% UPF -> Core (modified) +-define(TEID_U2AM, 16#0f0002). %% UPF -> Access (modified) -define(ADDR_U2C, << 16#7f, 16#00, 16#00, 16#01 >>). %% UPF -> Core -define(ADDR_C2U, << 16#7f, 16#00, 16#01, 16#01 >>). %% UPF <- Core @@ -14,5 +15,6 @@ -define(ADDR_U2A, << 16#7f, 16#00, 16#00, 16#02 >>). %% UPF -> Access -define(ADDR_U2CM, << 16#7f, 16#0f, 16#00, 16#01 >>). %% UPF -> Core (modified) +-define(ADDR_U2AM, << 16#7f, 16#0f, 16#00, 16#02 >>). %% UPF -> Access (modified) %% vim:set ts=4 sw=4 et: -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39147?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I750ada0a5a21edc8bc06d567c8000b6304966474 Gerrit-Change-Number: 39147 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 months, 3 weeks

1
0
0 0

[M] Change in ...osmo-s1gw[master]: erab_fsm: implement E-RAB MODIFY Ind/Cnf procedure

by fixeria

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39147?usp=email ) Change subject: erab_fsm: implement E-RAB MODIFY Ind/Cnf procedure ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39147?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I750ada0a5a21edc8bc06d567c8000b6304966474 Gerrit-Change-Number: 39147 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 14 Feb 2025 12:31:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 3 weeks

1
0
0 0

[M] Change in ...osmo-s1gw[master]: erab_fsm: implement E-RAB MODIFY Req/Rsp procedure

by fixeria

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39116?usp=email ) Change subject: erab_fsm: implement E-RAB MODIFY Req/Rsp procedure ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39116?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I24d57ea390d71b640cb42046a8658e9d30670682 Gerrit-Change-Number: 39116 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 14 Feb 2025 12:31:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 3 weeks

1
0
0 0

[S] Change in ...osmo-s1gw[master]: erab_fsm: handle RELEASE.{cmd,ind} in state erab_wait_setup_rsp

by fixeria

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39524?usp=email ) Change subject: erab_fsm: handle RELEASE.{cmd,ind} in state erab_wait_setup_rsp ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39524?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I91a010f304456c1593ef257051a912f0fe8ae2a1 Gerrit-Change-Number: 39524 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 14 Feb 2025 12:31:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 3 weeks

1
0
0 0

[S] Change in pysim[master]: euicc: Add euicc_memory_reset shell command

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/39409?usp=email ) Change subject: euicc: Add euicc_memory_reset shell command ...................................................................... euicc: Add euicc_memory_reset shell command This implements the ES10c eUICC Memory Reset procedure Change-Id: Ib462f5b7de3e500e51c0f3d6e2b9b0c2d3ba7e20 --- M docs/shell.rst M pySim/euicc.py 2 files changed, 42 insertions(+), 0 deletions(-) Approvals: dexter: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/docs/shell.rst b/docs/shell.rst index 026f5c8..564f162 100644 --- a/docs/shell.rst +++ b/docs/shell.rst @@ -1393,6 +1393,13 @@ "delete_result": "ok" } +euicc_memory_reset +~~~~~~~~~~~~~~~~~~ + +.. argparse:: + :module: pySim.euicc + :func: CardApplicationISDR.AddlShellCommands.mem_res_parser + get_eid ~~~~~~~ diff --git a/pySim/euicc.py b/pySim/euicc.py index e9321d6..64eb29c 100644 --- a/pySim/euicc.py +++ b/pySim/euicc.py @@ -268,6 +268,17 @@ class DeleteProfileResp(BER_TLV_IE, tag=0xbf33, nested=[DeleteResult]): pass +# SGP.22 Section 5.7.19: EuiccMemoryReset +class ResetOptions(BER_TLV_IE, tag=0x82): + _construct = FlagsEnum(Byte, deleteOperationalProfiles=0x80, deleteFieldLoadedTestProfiles=0x40, + resetDefaultSmdpAddress=0x20) +class ResetResult(BER_TLV_IE, tag=0x80): + _construct = Enum(Int8ub, ok=0, nothingToDelete=1, undefinedError=127) +class EuiccMemoryResetReq(BER_TLV_IE, tag=0xbf34, nested=[ResetOptions]): + pass +class EuiccMemoryResetResp(BER_TLV_IE, tag=0xbf34, nested=[ResetResult]): + pass + # SGP.22 Section 5.7.20 GetEID class EidValue(BER_TLV_IE, tag=0x5a): _construct = HexAdapter(GreedyBytes) @@ -504,6 +515,30 @@ d = dp.to_dict() self._cmd.poutput_json(flatten_dict_lists(d['delete_profile_resp'])) + mem_res_parser = argparse.ArgumentParser() + mem_res_parser.add_argument('--delete-operational', action='store_true', + help='Delete all operational profiles') + mem_res_parser.add_argument('--delete-test-field-installed', action='store_true', + help='Delete all test profiles, except pre-installed ones') + mem_res_parser.add_argument('--reset-smdp-address', action='store_true', + help='Reset the SM-DP+ address') + + @cmd2.with_argparser(mem_res_parser) + def do_euicc_memory_reset(self, opts): + """Perform an ES10c eUICCMemoryReset function. This will permanently delete the selected subset of + profiles from the eUICC.""" + flags = {} + if opts.delete_operational: + flags['deleteOperationalProfiles'] = True + if opts.delete_test_field_installed: + flags['deleteFieldLoadedTestProfiles'] = True + if opts.reset_smdp_address: + flags['resetDefaultSmdpAddress'] = True + + mr_cmd = EuiccMemoryResetReq(children=[ResetOptions(decoded=flags)]) + mr = CardApplicationISDR.store_data_tlv(self._cmd.lchan.scc, mr_cmd, EuiccMemoryResetResp) + d = mr.to_dict() + self._cmd.poutput_json(flatten_dict_lists(d['euicc_memory_reset_resp'])) def do_get_eid(self, _opts): """Perform an ES10c GetEID function.""" -- To view, visit https://gerrit.osmocom.org/c/pysim/+/39409?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib462f5b7de3e500e51c0f3d6e2b9b0c2d3ba7e20 Gerrit-Change-Number: 39409 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

4 months, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2025