fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38765?usp=email )

Change subject: erab_fsm: rename erab_release_req/1 -> erab_release_cmd/1 ......................................................................

erab_fsm: rename erab_release_req/1 -> erab_release_cmd/1

The respective S1AP PDU is COMMAND, not REQUEST.

Change-Id: I2f19d2c9bad52b89327f68f7dc6a2f6347a00ba0 --- M src/erab_fsm.erl M src/s1ap_proxy.erl M test/erab_fsm_test.erl 3 files changed, 7 insertions(+), 7 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/65/38765/1

diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index ae17a6e..fb6def3 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -49,7 +49,7 @@ -export([start_link/1, erab_setup_req/2, erab_setup_rsp/2, - erab_release_req/1, + erab_release_cmd/1, erab_release_rsp/1, shutdown/1]).

@@ -120,8 +120,8 @@ gen_statem:call(Pid, {?FUNCTION_NAME, F_TEID}).

--spec erab_release_req(pid()) -> ok. -erab_release_req(Pid) -> +-spec erab_release_cmd(pid()) -> ok. +erab_release_cmd(Pid) -> gen_statem:call(Pid, ?FUNCTION_NAME).

@@ -286,7 +286,7 @@ {keep_state, S};

erab_setup({call, From}, - erab_release_req, + erab_release_cmd, #erab_state{} = S) -> ?LOG_DEBUG("Rx E-RAB RELEASE Req"), {next_state, session_delete, diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index ea20106..5f7775e 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -451,7 +451,7 @@ #'E-RABItem'{'e-RAB-ID' = ERABId} = C, case erab_fsm_find(ERABId, S) of {ok, Pid} -> - ok = erab_fsm:erab_release_req(Pid), + ok = erab_fsm:erab_release_cmd(Pid), {{ok, C}, S}; error -> ?LOG_ERROR("E-RAB ~p is not registered", [erab_uid(ERABId, S)]), diff --git a/test/erab_fsm_test.erl b/test/erab_fsm_test.erl index 1722b3c..e4b036e 100644 --- a/test/erab_fsm_test.erl +++ b/test/erab_fsm_test.erl @@ -94,7 +94,7 @@ test_erab_release_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_req(Pid)), + ?_assertEqual(ok, erab_fsm:erab_release_cmd(Pid)), ?_assertEqual(ok, erab_fsm:erab_release_rsp(Pid)), ?_assertNot(erlang:is_process_alive(Pid))].

@@ -107,7 +107,7 @@ 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_req(Pid)), + ?_assertEqual({error, Error}, erab_fsm:erab_release_cmd(Pid)), ?_assertNot(erlang:is_process_alive(Pid))].