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

[M] Change in ...osmo-s1gw[master]: s1ap_proxy: implement per-eNB counters

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40648?usp=email ) Change subject: s1ap_proxy: implement per-eNB counters ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40648?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: Ib138a0843c783c5a21ec2646c8a671cce7e689ad Gerrit-Change-Number: 40648 Gerrit-PatchSet: 3 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: Tue, 15 Jul 2025 08:53:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 weeks, 3 days

1
0
0 0

[S] Change in ...osmo-s1gw[master]: s1ap_proxy: forward E-RAB RELEASE COMMAND/RESPONSE as-is

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40664?usp=email ) Change subject: s1ap_proxy: forward E-RAB RELEASE COMMAND/RESPONSE as-is ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40664?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: I0dc968d1a9a6ad03d6252c08380e33f5d3aac8d8 Gerrit-Change-Number: 40664 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: Tue, 15 Jul 2025 08:53:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 weeks, 3 days

1
0
0 0

[S] Change in ...osmo-s1gw[master]: s1ap_proxy: forward E-RAB RELEASE INDICATION as-is

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40663?usp=email ) Change subject: s1ap_proxy: forward E-RAB RELEASE INDICATION as-is ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40663?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: Ia4996bb2ecd665c03673df346f21718d365129a4 Gerrit-Change-Number: 40663 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: Tue, 15 Jul 2025 08:53:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 weeks, 3 days

1
0
0 0

[M] Change in osmo-msc[master]: msc: Initial implementation of N-PCSTATE.ind

by osmith

Attention is currently required from: fixeria, laforge, neels, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-msc/+/40630?usp=email ) Change subject: msc: Initial implementation of N-PCSTATE.ind ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/40630?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ice1b2c163b1b0d134fcaa1c8bf543038a35fabdf Gerrit-Change-Number: 40630 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 15 Jul 2025 08:51:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 weeks, 3 days

1
0
0 0

[XS] Change in osmo-msc[master]: ran_peer: Drop unused events CONNECTION_{SUCCESS,TIMEOUT}

by osmith

Attention is currently required from: fixeria, neels, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-msc/+/40671?usp=email ) Change subject: ran_peer: Drop unused events CONNECTION_{SUCCESS,TIMEOUT} ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/40671?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib22be87dc68ab12783eb9140b4a9e04bec06bdab Gerrit-Change-Number: 40671 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 15 Jul 2025 08:44:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 weeks, 3 days

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: sctp: Introduce test TC_stat_bsc_sctp_disconnected

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40681?usp=email ) Change subject: sctp: Introduce test TC_stat_bsc_sctp_disconnected ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40681/comment/d4e2c8c6_6960… : PS1, Line 7: sctp: Introduce test TC_stat_bsc_sctp_disconnected > smlc? It's correct, I meant BSC went disconnected, the peer here. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40681?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic67d9d8120e9bd09b0e54b237e93f49f79262be0 Gerrit-Change-Number: 40681 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 15 Jul 2025 08:36:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

2 weeks, 3 days

1
0
0 0

[S] Change in ...osmo-s1gw[master]: s1gw_metrics: add ctr_list/0 and gauge_list/0

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40647?usp=email ) Change subject: s1gw_metrics: add ctr_list/0 and gauge_list/0 ...................................................................... s1gw_metrics: add ctr_list/0 and gauge_list/0 Allow other modules to obtain lists of counters/gauges. This will be used in a follow-up patch registering per-eNB counters. Change-Id: I21f9b2b3dfe6b454b9dee2750cc692fd2dc13475 Related: SYS#7065 --- M src/s1gw_metrics.erl 1 file changed, 9 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/s1gw_metrics.erl b/src/s1gw_metrics.erl index 6eb917f..00e603d 100644 --- a/src/s1gw_metrics.erl +++ b/src/s1gw_metrics.erl @@ -38,11 +38,13 @@ ctr_reset/1, ctr_inc/1, ctr_inc/2, + ctr_list/0, gauge_reset/1, gauge_set/2, gauge_inc/1, gauge_inc/2, - gauge_dec/1]). + gauge_dec/1, + gauge_list/0]). -include_lib("kernel/include/logger.hrl"). -include("s1gw_metrics.hrl"). @@ -141,6 +143,9 @@ ctr_inc(Name) -> ctr_inc(Name, 1). +-spec ctr_list() -> [counter()]. +ctr_list() -> ?S1GW_COUNTERS. + %%%%%%%%%%%%% %% GAUGE APIs %%%%%%%%%%%%% @@ -167,5 +172,8 @@ gauge_dec(Name) -> gauge_inc(Name, -1). +-spec gauge_list() -> [gauge()]. +gauge_list() -> ?S1GW_GAUGES. + %% vim:set ts=4 sw=4 et: -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40647?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: I21f9b2b3dfe6b454b9dee2750cc692fd2dc13475 Gerrit-Change-Number: 40647 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 weeks, 3 days

1
0
0 0

[S] Change in ...osmo-s1gw[master]: s1gw_metrics: expose get_current_value/1

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40661?usp=email ) Change subject: s1gw_metrics: expose get_current_value/1 ...................................................................... s1gw_metrics: expose get_current_value/1 This API will be used in a follow-up patch adding tests for metrics. Change-Id: Ifd1d87dbf236379b39c7f70307a4a9d6540a9720 Related: SYS#7065 --- M src/s1gw_metrics.erl 1 file changed, 10 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/s1gw_metrics.erl b/src/s1gw_metrics.erl index 00e603d..317012d 100644 --- a/src/s1gw_metrics.erl +++ b/src/s1gw_metrics.erl @@ -35,6 +35,7 @@ -module(s1gw_metrics). -export([init/0, + get_current_value/1, ctr_reset/1, ctr_inc/1, ctr_inc/2, @@ -99,6 +100,7 @@ -type counter() :: [ctr | _]. -type gauge() :: [gauge | _]. +-type metric() :: counter() | gauge(). -spec register_all(Type, List) -> Result @@ -109,13 +111,6 @@ lists:filter(fun(Name) -> exometer:new(Name, Type) =/= ok end, List). --spec get_current_value(counter() | gauge()) -> integer(). -get_current_value(Name) -> - Result = exometer:get_value(Name, value), - {ok, [{value, PrevVal}]} = Result, - PrevVal. - - %% ------------------------------------------------------------------ %% public API %% ------------------------------------------------------------------ @@ -126,6 +121,14 @@ [] = register_all(counter, ?S1GW_COUNTERS), [] = register_all(gauge, ?S1GW_GAUGES). + +-spec get_current_value(metric()) -> integer(). +get_current_value(Name) -> + Result = exometer:get_value(Name, value), + {ok, [{value, Value}]} = Result, + Value. + + %%%%%%%%%%%%% %% CTR APIs %%%%%%%%%%%%% -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40661?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: Ifd1d87dbf236379b39c7f70307a4a9d6540a9720 Gerrit-Change-Number: 40661 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 weeks, 3 days

1
0
0 0

[M] Change in ...osmo-s1gw[master]: s1ap_proxy_test: also test exometer counters

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40662?usp=email ) Change subject: s1ap_proxy_test: also test exometer counters ...................................................................... s1ap_proxy_test: also test exometer counters Change-Id: Icef5fc68d72278f3042e951db04d8a93f0a00670 Related: SYS#7065 --- D test/exometer_mock.erl M test/s1ap_proxy_test.erl 2 files changed, 79 insertions(+), 27 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/test/exometer_mock.erl b/test/exometer_mock.erl deleted file mode 100644 index 5a09692..0000000 --- a/test/exometer_mock.erl +++ /dev/null @@ -1,24 +0,0 @@ --module(exometer_mock). - --export([mock_all/0, - unmock_all/0]). - - -%% ------------------------------------------------------------------ -%% public API -%% ------------------------------------------------------------------ - -%% mock all pfcp_peer module functions -mock_all() -> - meck:new(exometer), - meck:expect(exometer, new, fun(_Name, _Type) -> ok end), - meck:expect(exometer, reset, fun(_Name) -> ok end), - meck:expect(exometer, update, fun(_Name, _Value) -> ok end), - meck:expect(exometer, get_value, fun(_Name, DataPoint) -> {ok,[{DataPoint,0}]} end). - -%% unmock all pfcp_peer module functions -unmock_all() -> - true = meck:validate(exometer), - meck:unload(exometer). - -%% vim:set ts=4 sw=4 et: diff --git a/test/s1ap_proxy_test.erl b/test/s1ap_proxy_test.erl index 74f3f05..4f79451 100644 --- a/test/s1ap_proxy_test.erl +++ b/test/s1ap_proxy_test.erl @@ -1,9 +1,14 @@ -module(s1ap_proxy_test). -include_lib("eunit/include/eunit.hrl"). +-include("s1gw_metrics.hrl"). -include("pfcp_mock.hrl"). +-define(_assertMetric(Name, Value), + ?_assertEqual(Value, s1gw_metrics:get_current_value(Name))). + + %% ------------------------------------------------------------------ %% setup functions %% ------------------------------------------------------------------ @@ -16,14 +21,15 @@ start() -> pfcp_mock:mock_all(), - exometer_mock:mock_all(), + exometer:start(), + s1gw_metrics:init(), {ok, Pid} = s1ap_proxy:start_link(), #{handler => Pid}. stop(#{handler := Pid}) -> s1ap_proxy:shutdown(Pid), - exometer_mock:unmock_all(), + exometer:stop(), pfcp_mock:unmock_all(). @@ -67,7 +73,10 @@ test_s1_setup_req(#{handler := Pid}) -> SetupReq = s1_setup_req_pdu(), %% Expect the PDU to be proxied unmodified - [?_assertEqual({forward, SetupReq}, s1ap_proxy:process_pdu(Pid, SetupReq))]. + [?_assertEqual({forward, SetupReq}, s1ap_proxy:process_pdu(Pid, SetupReq)), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 1), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, 1), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, 1)]. test_e_rab_setup(#{handler := Pid}) -> @@ -80,6 +89,11 @@ [?_assertEqual({forward, SetupReqExp}, s1ap_proxy:process_pdu(Pid, SetupReqIn)), ?_assertEqual({forward, SetupRspExp}, s1ap_proxy:process_pdu(Pid, SetupRspIn)), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 2), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_SETUP_REQ, 1), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_SETUP_RSP, 1), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, 2), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_PROC, 2), ?_assertMatch({ok, _}, s1ap_proxy:fetch_erab(Pid, {7, 9, 6})), ?_assertMatch([_], s1ap_proxy:fetch_erab_list(Pid))]. @@ -94,6 +108,12 @@ SetupRspExp = e_rab_setup_rsp_fail_pdu(), [?_assertEqual({reply, SetupRspExp}, s1ap_proxy:process_pdu(Pid, SetupReqIn)), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 1), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_SETUP_REQ, 1), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, 0), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_PROC, 0), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_REPLY_ALL, 1), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_REPLY_ERAB_SETUP_RSP, 1), ?_assertEqual([], s1ap_proxy:fetch_erab_list(Pid))]. @@ -112,6 +132,12 @@ ?_assertMatch([_], s1ap_proxy:fetch_erab_list(Pid)), ?_assertEqual({forward, ReleaseCmd}, s1ap_proxy:process_pdu(Pid, ReleaseCmd)), ?_assertEqual({forward, ReleaseRsp}, s1ap_proxy:process_pdu(Pid, ReleaseRsp)), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 2 + 2), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_RELEASE_CMD, 1), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_RELEASE_RSP, 1), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, 2 + 2), +%% ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_PROC, 2), +%% ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, 2), ?_assertEqual([], s1ap_proxy:fetch_erab_list(Pid))]. @@ -126,6 +152,10 @@ [?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, SetupReq)), ?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, SetupRsp)), ?_assertEqual({forward, ReleaseInd}, s1ap_proxy:process_pdu(Pid, ReleaseInd)), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 3), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_RELEASE_IND, 1), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, 2 + 1), +%% ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, 1), ?_assertEqual([], s1ap_proxy:fetch_erab_list(Pid))]. @@ -148,6 +178,12 @@ ?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, SetupRsp)), ?_assertEqual({forward, ModifyReqExp}, s1ap_proxy:process_pdu(Pid, ModifyReqIn)), ?_assertEqual({forward, ModifyRsp}, s1ap_proxy:process_pdu(Pid, ModifyRsp)), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 2 + 2), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_MODIFY_REQ, 1), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_MODIFY_RSP, 1), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, 2 + 2), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_PROC, 2 + 1), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, 1), ?_assertEqual({forward, ReleaseInd}, s1ap_proxy:process_pdu(Pid, ReleaseInd)), ?_assertEqual([], s1ap_proxy:fetch_erab_list(Pid))]. @@ -168,6 +204,12 @@ ?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, SetupRsp)), ?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, ModifyReq)), ?_assertEqual({forward, ModifyRsp}, s1ap_proxy:process_pdu(Pid, ModifyRsp)), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 2 + 2), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_MODIFY_REQ, 1), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_MODIFY_RSP, 1), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, 2 + 2), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_PROC, 2 + 1), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, 1), ?_assertEqual({forward, ReleaseInd}, s1ap_proxy:process_pdu(Pid, ReleaseInd)), ?_assertEqual([], s1ap_proxy:fetch_erab_list(Pid))]. @@ -191,6 +233,12 @@ ?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, SetupRsp)), ?_assertEqual({forward, ModifyIndExp}, s1ap_proxy:process_pdu(Pid, ModifyIndIn)), ?_assertEqual({forward, ModifyCnf}, s1ap_proxy:process_pdu(Pid, ModifyCnf)), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 2 + 2), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_MOD_IND, 1), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_MOD_CNF, 1), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, 2 + 2), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_PROC, 2 + 1), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, 1), ?_assertEqual({forward, ReleaseInd}, s1ap_proxy:process_pdu(Pid, ReleaseInd)), ?_assertEqual([], s1ap_proxy:fetch_erab_list(Pid))]. @@ -214,6 +262,12 @@ ?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, SetupRsp)), ?_assertEqual({forward, ModifyIndExp}, s1ap_proxy:process_pdu(Pid, ModifyIndIn)), ?_assertEqual({forward, ModifyCnf}, s1ap_proxy:process_pdu(Pid, ModifyCnf)), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 2 + 2), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_MOD_IND, 1), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_MOD_CNF, 1), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, 2 + 2), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_PROC, 2 + 1), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, 1), ?_assertEqual({forward, ReleaseInd}, s1ap_proxy:process_pdu(Pid, ReleaseInd)), ?_assertEqual([], s1ap_proxy:fetch_erab_list(Pid))]. @@ -235,6 +289,12 @@ ?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, SetupRsp)), ?_assertEqual({forward, ModifyIndExp}, s1ap_proxy:process_pdu(Pid, ModifyIndIn)), ?_assertEqual({forward, ModifyCnf}, s1ap_proxy:process_pdu(Pid, ModifyCnf)), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 2 + 2), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_MOD_IND, 1), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_MOD_CNF, 1), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, 2 + 2), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_PROC, 2 + 1), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, 1), ?_assertEqual([], s1ap_proxy:fetch_erab_list(Pid))]. @@ -248,6 +308,11 @@ [?_assertEqual({forward, InitCtxSetupReqExp}, s1ap_proxy:process_pdu(Pid, InitCtxSetupReqIn)), ?_assertEqual({forward, InitCtxSetupRspExp}, s1ap_proxy:process_pdu(Pid, InitCtxSetupRspIn)), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 2), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_INIT_CTX_REQ, 1), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_INIT_CTX_RSP, 1), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, 2), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_PROC, 2), ?_assertMatch([_], s1ap_proxy:fetch_erab_list(Pid))]. @@ -262,6 +327,11 @@ [?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, InitCtxSetupReq)), ?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, InitCtxSetupRsp)), ?_assertEqual({forward, UeCtxReleaseReq}, s1ap_proxy:process_pdu(Pid, UeCtxReleaseReq)), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 2 + 1), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_RELEASE_CTX_REQ, 1), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, 2 + 1), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_PROC, 2), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, 1), ?_assertMatch([], s1ap_proxy:fetch_erab_list(Pid))]. @@ -279,6 +349,12 @@ ?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, InitCtxSetupRsp)), ?_assertEqual({forward, UeCtxReleaseCmd}, s1ap_proxy:process_pdu(Pid, UeCtxReleaseCmd)), ?_assertEqual({forward, UeCtxReleaseCompl}, s1ap_proxy:process_pdu(Pid, UeCtxReleaseCompl)), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 2 + 2), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_RELEASE_CTX_CMD, 1), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_RELEASE_CTX_COMPL, 1), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, 2 + 2), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_PROC, 2), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, 2), ?_assertMatch([], s1ap_proxy:fetch_erab_list(Pid))]. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40662?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: Icef5fc68d72278f3042e951db04d8a93f0a00670 Gerrit-Change-Number: 40662 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 weeks, 3 days

1
0
0 0

[XS] Change in osmo-msc[master]: constify ptr arg in ran_peer_find_by_addr()

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/40669?usp=email ) Change subject: constify ptr arg in ran_peer_find_by_addr() ...................................................................... constify ptr arg in ran_peer_find_by_addr() Change-Id: I0d725d3994e1d4192a29930515176a8f08fa33bd --- M include/osmocom/msc/ran_peer.h M src/libmsc/ran_peer.c 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/include/osmocom/msc/ran_peer.h b/include/osmocom/msc/ran_peer.h index c936d5c..5e85c34 100644 --- a/include/osmocom/msc/ran_peer.h +++ b/include/osmocom/msc/ran_peer.h @@ -91,7 +91,7 @@ }; struct ran_peer *ran_peer_find_or_create(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *peer_addr); -struct ran_peer *ran_peer_find_by_addr(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *peer_addr); +struct ran_peer *ran_peer_find_by_addr(const struct sccp_ran_inst *sri, const struct osmo_sccp_addr *peer_addr); void ran_peer_cells_seen_add(struct ran_peer *ran_peer, const struct gsm0808_cell_id *id); diff --git a/src/libmsc/ran_peer.c b/src/libmsc/ran_peer.c index 09e57eb..7cc10e7 100644 --- a/src/libmsc/ran_peer.c +++ b/src/libmsc/ran_peer.c @@ -87,7 +87,7 @@ return ran_peer_alloc(sri, peer_addr); } -struct ran_peer *ran_peer_find_by_addr(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *peer_addr) +struct ran_peer *ran_peer_find_by_addr(const struct sccp_ran_inst *sri, const struct osmo_sccp_addr *peer_addr) { struct ran_peer *rp; llist_for_each_entry(rp, &sri->ran_peers, entry) { -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/40669?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0d725d3994e1d4192a29930515176a8f08fa33bd Gerrit-Change-Number: 40669 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 weeks, 3 days

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2025