- gerrit-log - lists.osmocom.org

[S] Change in ...osmo-s1gw[master]: pfcp_peer: implement the Heartbeat procedure
by fixeria 04 Sep '24

04 Sep '24

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37963?usp=email ) Change subject: pfcp_peer: implement the Heartbeat procedure ...................................................................... pfcp_peer: implement the Heartbeat procedure Change-Id: Ic4682d49f2e1df08d241500b7b4e75edadaeb91a --- M src/pfcp_peer.erl 1 file changed, 32 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/pfcp_peer.erl b/src/pfcp_peer.erl index b190f12..8c29a9f 100644 --- a/src/pfcp_peer.erl +++ b/src/pfcp_peer.erl @@ -169,7 +169,8 @@ %% Handle incoming PFCP PDU(s) connecting(info, {udp, Sock, FromIp, FromPort, Data}, #peer_state{sock = Sock} = S) -> - case decode_pdu(Data, {FromIp, FromPort}, S) of + PDU = decode_pdu(Data, {FromIp, FromPort}, S), + case PDU of #pfcp{type = association_setup_response, ie = #{pfcp_cause := 'Request accepted', recovery_time_stamp := #recovery_time_stamp{time = RRTS}}} -> @@ -180,7 +181,13 @@ ie = #{pfcp_cause := Cause}} -> ?LOG_ERROR("Rx Association Setup Response (~p)", [Cause]), {stop, {shutdown, assoc_setup_nack}}; - PDU -> + %% 3GPP TS 29.244, 6.2.2.2 Heartbeat Request + %% A CP function or UP function shall be prepared to receive a Heartbeat Request + %% at any time (even from unknown peers) and it shall reply with a Heartbeat Response. + #pfcp{type = heartbeat_request} -> + recv_heartbeat_request(PDU, {FromIp, FromPort}, S), + {keep_state, S}; + _ -> ?LOG_NOTICE("Rx unexpected PFCP PDU: ~p", [PDU]), {keep_state, S} end; @@ -216,7 +223,13 @@ connected(info, {udp, Sock, FromIp, FromPort, Data}, #peer_state{sock = Sock} = S) -> PDU = decode_pdu(Data, {FromIp, FromPort}, S), - route_pdu(PDU, S), + case PDU of + %% 3GPP TS 29.244, 6.2.2.2 Heartbeat Request + #pfcp{type = heartbeat_request} -> + recv_heartbeat_request(PDU, {FromIp, FromPort}, S); + _ -> + route_pdu(PDU, S) + end, {keep_state, S}; %% Catch-all handler for this state @@ -409,4 +422,20 @@ send_session_delete_req(SEID, S) -> send_pdu(SEID, {session_deletion_request, []}, S). + +%% 6.2.2 Heartbeat Procedure +%% 7.4.2 Heartbeat Messages +recv_heartbeat_request(#pfcp{type = heartbeat_request, + seq_no = SeqNr, + ie = ReqIEs}, + {FromIp, FromPort}, + #peer_state{loc_rts = LRTS} = S) -> + ?LOG_INFO("Rx Heartbeat Request from ~p:~p: ~p", [FromIp, FromPort, ReqIEs]), + RspIEs = #{recovery_time_stamp => #recovery_time_stamp{time = LRTS}}, + %% Fake #peer_state to force the right destination and SeqNr + {Result, _} = send_pdu({heartbeat_response, RspIEs}, + S#peer_state{seq_nr = SeqNr, + rem_addr = FromIp}), + Result. + %% vim:set ts=4 sw=4 et: -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37963?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: Ic4682d49f2e1df08d241500b7b4e75edadaeb91a Gerrit-Change-Number: 37963 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>

1 0

[XS] Change in ...osmo-s1gw[master]: pfcp_peer: do not route incoming PDUs without SEID
by fixeria 04 Sep '24

04 Sep '24

Attention is currently required from: laforge. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37964?usp=email ) Change subject: pfcp_peer: do not route incoming PDUs without SEID ...................................................................... Patch Set 1: (1 comment) File src/pfcp_peer.erl: https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37964/comment/0f5888b2_1f88… : PS1, Line 233: ?LOG_NOTICE("Rx unexpected PFCP PDU: ~p", [PDU]) > this should likely also generate some kind of PFCP error message back to the peer? Acknowledged -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37964?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: I7d33ec4e883b217b2b4f65e4866d9365c32c753d Gerrit-Change-Number: 37964 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: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 04 Sep 2024 13:12:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in osmo-hnbgw[master]: Revert "hnb_persistent: Use incrementing counter for rate_ctr + stat_...
by neels 04 Sep '24

04 Sep '24

Attention is currently required from: fixeria, laforge. neels has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/38002?usp=email ) Change subject: Revert "hnb_persistent: Use incrementing counter for rate_ctr + stat_item index" ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/38002?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I2f7d3f3c88775e2926661e4760ec1d8723c0400c Gerrit-Change-Number: 38002 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 04 Sep 2024 13:11:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in ...pyosmocom[master]: Introduce a new 'hexstr' type to represent hex-strings
by fixeria 04 Sep '24

04 Sep '24

Attention is currently required from: laforge. fixeria has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/38023?usp=email ) Change subject: Introduce a new 'hexstr' type to represent hex-strings ...................................................................... Patch Set 2: Code-Review+1 (2 comments) File src/osmocom/utils.py: https://gerrit.osmocom.org/c/python/pyosmocom/+/38023/comment/1d628067_75d6… : PS2, Line 141: hexstr Class names should use CamelCase in python (according to PEP 8): https://peps.python.org/pep-0008/#class-names Built-in Python's classes not always comply to this, but I believe user defined ones should? https://gerrit.osmocom.org/c/python/pyosmocom/+/38023/comment/cb642983_64e9… : PS2, Line 151: other `... other: str) -> bool`? -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/38023?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: I16c0df809bc11ec0f98e8ade404f9b82072e3a06 Gerrit-Change-Number: 38023 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 04 Sep 2024 13:10:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[M] Change in ...pyosmocom[master]: Introduce a new 'hexstr' type to represent hex-strings
by pespin 04 Sep '24

04 Sep '24

Attention is currently required from: fixeria, laforge. pespin has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/38023?usp=email ) Change subject: Introduce a new 'hexstr' type to represent hex-strings ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/38023?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: I16c0df809bc11ec0f98e8ade404f9b82072e3a06 Gerrit-Change-Number: 38023 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 04 Sep 2024 11:44:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ci[master]: gerrit-verifications,master-builds: Add pyosmocom
by pespin 04 Sep '24

04 Sep '24

Attention is currently required from: laforge. pespin has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/osmo-ci/+/38024?usp=email ) Change subject: gerrit-verifications,master-builds: Add pyosmocom ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File jobs/gerrit-verifications.yml: https://gerrit.osmocom.org/c/osmo-ci/+/38024/comment/cf9386a7_5a480a2c?usp=… : PS1, Line 319: #pipeline_binpkgs: "debian:10 debian:12" This comment can be dropped? -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38024?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9ec289f8d3116bbc8291298146c58d0209684439 Gerrit-Change-Number: 38024 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 04 Sep 2024 11:41:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-ttcn3-hacks[master]: s1gw: ConnHdlr: Use stats reported by osmo-s1gw to expect PFCP Assoc ...
by pespin 04 Sep '24

04 Sep '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37959?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: s1gw: ConnHdlr: Use stats reported by osmo-s1gw to expect PFCP Assoc Setup ...................................................................... s1gw: ConnHdlr: Use stats reported by osmo-s1gw to expect PFCP Assoc Setup Change-Id: I329745125d78786fc9c243f0047cd394de9b16d4 --- M s1gw/S1GW_ConnHdlr.ttcn M s1gw/osmo-s1gw.config 2 files changed, 64 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/s1gw/S1GW_ConnHdlr.ttcn b/s1gw/S1GW_ConnHdlr.ttcn index 6a1eb39..4505c1c 100644 --- a/s1gw/S1GW_ConnHdlr.ttcn +++ b/s1gw/S1GW_ConnHdlr.ttcn @@ -269,11 +269,22 @@ function f_ConnHdlr_register_pfcp() runs on ConnHdlr { f_pfcp_register(); - if (g_pars.idx == 0) { - /* First ConnHdlr answers the AssocSetup: */ - activate(as_pfcp_handle_assoc_setup_req(do_repeat := true)); - } else { + + /* First ConnHdlr answers the AssocSetup: */ + if (g_pars.idx != 0) { activate(as_pfcp_ignore(PFCP, tr_PFCP_Assoc_Setup_Req())); + return; + } + + var StatsDMetricKeys statsd_keys := { + valueof(ts_StatsDMetricKey(g_pars.statsd_prefix & "gauge.pfcp.associated.value", "g")) + }; + var StatsDMetrics statsd_snapshot := f_statsd_snapshot(statsd_keys, since_last_snapshot := false); + var boolean pfcp_associated := statsd_snapshot[0].val == 1; + + if (not pfcp_associated) { + log("Waiting for IUT to associate over PFCP"); + f_pfcp_wait_assoc_setup(); } } } diff --git a/s1gw/osmo-s1gw.config b/s1gw/osmo-s1gw.config index 86a89c1..8fcd994 100644 --- a/s1gw/osmo-s1gw.config +++ b/s1gw/osmo-s1gw.config @@ -32,6 +32,54 @@ {prefix, [" ", prefix, " ::"], ""}, " ", msg, {mfa, [" (", mfa, ":", line, ")"], ""}, - reset, "\n"]}}}}]}]}]. + reset, "\n"]}}}}]} + ] + }, + {exometer_core, + [{predefined, + [%{[erlang, memory], {function, erlang, memory, [], value, []}, []}, + %{[erlang, system_info], {function, erlang, system_info, ['$dp'], value, [process_count]}, []}, + %{[erlang, statistics], {function, erlang, statistics, ['$dp'], value, [run_queue]}, []}, + %{[erlang, io], {function, erlang, statistics, [io], match, {{'_', input}, {'_', output}}}, []} + ] + }, + {report, + [{reporters, + [%%{exometer_report_tty, []}, + {exometer_report_statsd, + [{hostname, "127.0.4.10"}, + {port, 8125}, + {prefix, "s1gw"}, + {type_map, []} + ] + } + ] + }, + {subscribers, + [%%{select, {[{ {['_' | '_'],'_','_'}, [], ['$_']}], + %% exometer_report_tty, value, 1000, true}} + {select, {[{ {['_' | '_'],counter,'_'}, [], ['$_']}], + exometer_report_statsd, + value, + 1000, + true, + [{report_type, counter}] + } + }, + {select, {[{ {['_' | '_'],gauge,'_'}, [], ['$_']}], + exometer_report_statsd, + value, + 1000, + true, + [{report_type, gauge}] + } + } + ] + } + ] + } + ] + } +]. %% vim:set ts=2 sw=2 et: -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37959?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I329745125d78786fc9c243f0047cd394de9b16d4 Gerrit-Change-Number: 37959 Gerrit-PatchSet: 3 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: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: s1gw: Initial StatsD support
by pespin 04 Sep '24

04 Sep '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37958?usp=email ) Change subject: s1gw: Initial StatsD support ...................................................................... s1gw: Initial StatsD support Change-Id: Ib98c2fe68006a8d0f45de6966927b349a3b933ca --- M s1gw/S1GW_ConnHdlr.ttcn M s1gw/S1GW_Tests.cfg M s1gw/S1GW_Tests.ttcn M s1gw/gen_links.sh M s1gw/regen_makefile.sh 5 files changed, 43 insertions(+), 10 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/s1gw/S1GW_ConnHdlr.ttcn b/s1gw/S1GW_ConnHdlr.ttcn index bb2a309..6a1eb39 100644 --- a/s1gw/S1GW_ConnHdlr.ttcn +++ b/s1gw/S1GW_ConnHdlr.ttcn @@ -34,9 +34,13 @@ import from S1AP_Constants all; import from SCTP_Templates all; + +import from StatsD_Types all; +import from StatsD_Checker all; + import from S1AP_Server all; -type component ConnHdlr extends S1APSRV_ConnHdlr, PFCP_ConnHdlr { +type component ConnHdlr extends S1APSRV_ConnHdlr, PFCP_ConnHdlr, StatsD_ConnHdlr { var ConnHdlrPars g_pars; port S1AP_CODEC_PT S1AP_ENB; var ConnectionId g_s1ap_conn_id := -1; @@ -45,7 +49,8 @@ type record ConnHdlrPars { integer idx, - Global_ENB_ID genb_id + Global_ENB_ID genb_id, + charstring statsd_prefix }; template Global_ENB_ID @@ -59,9 +64,10 @@ } template (value) ConnHdlrPars -t_ConnHdlrPars(integer idx := 0) := { +t_ConnHdlrPars(integer idx := 0, charstring statsd_prefix := "") := { idx := idx, - genb_id := ts_Global_ENB_ID(idx) + genb_id := ts_Global_ENB_ID(idx), + statsd_prefix := statsd_prefix } type function void_fn(charstring id) runs on ConnHdlr; diff --git a/s1gw/S1GW_Tests.cfg b/s1gw/S1GW_Tests.cfg index dfcdbb9..54e7992 100644 --- a/s1gw/S1GW_Tests.cfg +++ b/s1gw/S1GW_Tests.cfg @@ -17,6 +17,8 @@ S1GW_Tests.mp_mme_bind_ip := "127.0.2.10"; S1GW_Tests.mp_s1gw_upf_ip := "127.0.3.1"; S1GW_Tests.mp_upf_bind_ip := "127.0.3.10"; +S1GW_Tests.mp_local_statsd_ip := "127.0.4.10"; +S1GW_Tests.mp_local_statsd_port := 8125; [MAIN_CONTROLLER] diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index 00b83e8..765d3d8 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -34,6 +34,12 @@ import from PFCP_CodecPort all; import from SCTP_Templates all; + +import from StatsD_Types all; +import from StatsD_CodecPort all; +import from StatsD_CodecPort_CtrlFunct all; +import from StatsD_Checker all; + import from S1AP_Server all; import from S1GW_ConnHdlr all; @@ -44,12 +50,18 @@ charstring mp_mme_bind_ip := "127.0.2.10"; /* MME address on which we get connections from S1GW */ charstring mp_s1gw_upf_ip := "127.0.3.1"; /* UPF facing address of the S1GW */ charstring mp_upf_bind_ip := "127.0.3.10"; /* UPF address on which we get connections from S1GW */ + + /* Our emulated StatsD server: */ + charstring mp_local_statsd_ip := "127.0.4.10"; + integer mp_local_statsd_port := 8125; + charstring mp_statsd_prefix := "s1gw."; } -type component test_CT { +type component test_CT extends StatsD_Checker_CT { timer g_Tguard; var S1AP_Server_CT vc_S1APSRV; var PFCP_Emulation_CT vc_PFCP; + var StatsD_Checker_CT vc_STATSD; }; private altstep as_Tguard() runs on test_CT { @@ -64,6 +76,8 @@ g_Tguard.start(Tval); activate(as_Tguard()); + f_init_statsd("StatsDSRV", vc_STATSD, mp_local_statsd_ip, mp_local_statsd_port); + if (s1apsrv_start) { f_init_s1ap_srv(); } @@ -95,12 +109,20 @@ vc_PFCP.start(PFCP_Emulation.main(pfcp_cfg)); } +function f_new_ConnHdlrPars(integer idx := 0) return ConnHdlrPars { + var ConnHdlrPars pars := valueof(t_ConnHdlrPars(idx, mp_statsd_prefix)); + return pars; +} + function f_ConnHdlr_spawn(void_fn fn, ConnHdlrPars pars) runs on test_CT return ConnHdlr { var ConnHdlr vc_conn; var charstring id := "ConnHdlr-" & testcasename() & "-" & int2str(pars.idx); vc_conn := ConnHdlr.create(id) alive; + if (isbound(vc_STATSD) and vc_STATSD.running) { + connect(vc_conn:STATSD_PROC, vc_STATSD:STATSD_PROC); + } if (isbound(vc_S1APSRV) and vc_S1APSRV.running) { connect(vc_conn:S1AP_CONN, vc_S1APSRV:S1AP_CLIENT); connect(vc_conn:S1AP_PROC, vc_S1APSRV:S1AP_PROC); @@ -126,7 +148,7 @@ f_ConnHdlr_s1ap_unregister(g_pars.genb_id); } testcase TC_setup() runs on test_CT { - var ConnHdlrPars pars := valueof(t_ConnHdlrPars); + var ConnHdlrPars pars := f_new_ConnHdlrPars(); var ConnHdlr vc_conn; f_init(); @@ -140,7 +162,7 @@ f_init(); for (var integer i := 0; i < 42; i := i + 1) { - var ConnHdlrPars pars := valueof(t_ConnHdlrPars(i)); + var ConnHdlrPars pars := f_new_ConnHdlrPars(i); var ConnHdlr vc_conn := f_ConnHdlr_spawn(refers(f_TC_setup), pars); vc_conns := vc_conns & { vc_conn }; } @@ -168,7 +190,7 @@ f_ConnHdlr_s1ap_unregister(g_pars.genb_id); } testcase TC_conn_term_by_mme() runs on test_CT { - var ConnHdlrPars pars := valueof(t_ConnHdlrPars); + var ConnHdlrPars pars := f_new_ConnHdlrPars(); var ConnHdlr vc_conn; f_init(); @@ -188,7 +210,7 @@ setverdict(pass); } testcase TC_conn_term_mme_unavail() runs on test_CT { - var ConnHdlrPars pars := valueof(t_ConnHdlrPars); + var ConnHdlrPars pars := f_new_ConnHdlrPars(); var ConnHdlr vc_conn; f_init(s1apsrv_start := false); @@ -263,7 +285,7 @@ f_ConnHdlr_s1ap_unregister(g_pars.genb_id); } testcase TC_e_rab_setup() runs on test_CT { - var ConnHdlrPars pars := valueof(t_ConnHdlrPars); + var ConnHdlrPars pars := f_new_ConnHdlrPars(); var ConnHdlr vc_conn; f_init(); diff --git a/s1gw/gen_links.sh b/s1gw/gen_links.sh index ef8bdde..919e7f8 100755 --- a/s1gw/gen_links.sh +++ b/s1gw/gen_links.sh @@ -32,6 +32,7 @@ FILES+="PFCP_CodecPort.ttcn PFCP_CodecPort_CtrlFunct.ttcn PFCP_CodecPort_CtrlFunctDef.cc PFCP_Emulation.ttcn PFCP_Templates.ttcn " FILES+="S1AP_CodecPort.ttcn S1AP_CodecPort_CtrlFunctDef.cc S1AP_CodecPort_CtrlFunct.ttcn " FILES+="SCTP_Templates.ttcn " +FILES+="StatsD_Types.ttcn StatsD_CodecPort.ttcn StatsD_CodecPort_CtrlFunct.ttcn StatsD_CodecPort_CtrlFunctdef.cc StatsD_Checker.ttcnpp " gen_links $DIR $FILES ignore_pp_results diff --git a/s1gw/regen_makefile.sh b/s1gw/regen_makefile.sh index 8c32b3d..adf765e 100755 --- a/s1gw/regen_makefile.sh +++ b/s1gw/regen_makefile.sh @@ -5,12 +5,14 @@ FILES=" *.asn *.ttcn + *.ttcnpp IPL4asp_PT.cc IPL4asp_discovery.cc Native_FunctionDefs.cc PFCP_CodecPort_CtrlFunctDef.cc S1AP_CodecPort_CtrlFunctDef.cc S1AP_EncDec.cc + StatsD_CodecPort_CtrlFunctdef.cc TCCConversion.cc TCCEncoding.cc TCCInterface.cc -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37958?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib98c2fe68006a8d0f45de6966927b349a3b933ca Gerrit-Change-Number: 37958 Gerrit-PatchSet: 3 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: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: s1gw: TC_setup: Validate some metrics
by pespin 04 Sep '24

04 Sep '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37960?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: s1gw: TC_setup: Validate some metrics ...................................................................... s1gw: TC_setup: Validate some metrics Change-Id: Iae629bc9291ff8b6e482f61d692e4d97ff0136bd --- M s1gw/S1GW_Tests.ttcn 1 file changed, 28 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index 765d3d8..06e4877 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -140,11 +140,25 @@ f_ConnHdlr_register_pfcp(); f_ConnHdlr_s1ap_register(g_pars.genb_id); + /* Expected values relative to snapshot: */ + var StatsDExpects statsd_exp := { + {name := mp_statsd_prefix & "gauge.s1ap.enb.num_sctp_connections.value", mtype := "g", min := 1, max := 1}, + {name := mp_statsd_prefix & "ctr.s1ap.proxy.in_pkt.unmodified.value", mtype := "c", min := 2, max := 2} + } + var StatsDMetrics statsd_snapshot := f_statsd_snapshot(f_statsd_keys_from_expect(statsd_exp)); + f_ConnHdlr_s1ap_connect(mp_enb_bind_ip, mp_s1gw_enb_ip); f_ConnHdlr_s1ap_setup(g_pars.genb_id); f_sleep(0.5); /* keep the connection idle for some time */ + + f_statsd_expect_from_snapshot(statsd_exp, wait_converge := true, snapshot := statsd_snapshot); + f_ConnHdlr_s1ap_disconnect(); + /* Validate gauge decreases when we disconnect: */ + f_statsd_expect({{name := mp_statsd_prefix & "gauge.s1ap.enb.num_sctp_connections.value", mtype := "g", min := 0, max := 0}}, + wait_converge := true); + f_ConnHdlr_s1ap_unregister(g_pars.genb_id); } testcase TC_setup() runs on test_CT { @@ -156,6 +170,19 @@ vc_conn := f_ConnHdlr_spawn(refers(f_TC_setup), pars); vc_conn.done; } + +function f_TC_setup_multi(charstring id) runs on ConnHdlr { + f_ConnHdlr_register_pfcp(); + f_ConnHdlr_s1ap_register(g_pars.genb_id); + + f_ConnHdlr_s1ap_connect(mp_enb_bind_ip, mp_s1gw_enb_ip); + f_ConnHdlr_s1ap_setup(g_pars.genb_id); + f_sleep(0.5); /* keep the connection idle for some time */ + + f_ConnHdlr_s1ap_disconnect(); + + f_ConnHdlr_s1ap_unregister(g_pars.genb_id); +} testcase TC_setup_multi() runs on test_CT { var ConnHdlrList vc_conns := { }; @@ -163,7 +190,7 @@ for (var integer i := 0; i < 42; i := i + 1) { var ConnHdlrPars pars := f_new_ConnHdlrPars(i); - var ConnHdlr vc_conn := f_ConnHdlr_spawn(refers(f_TC_setup), pars); + var ConnHdlr vc_conn := f_ConnHdlr_spawn(refers(f_TC_setup_multi), pars); vc_conns := vc_conns & { vc_conn }; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37960?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iae629bc9291ff8b6e482f61d692e4d97ff0136bd Gerrit-Change-Number: 37960 Gerrit-PatchSet: 3 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: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: update osmo-stp.cfg to make STP_Tests work at all again
by pespin 04 Sep '24

04 Sep '24

Attention is currently required from: fixeria, laforge. pespin has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38021?usp=email ) Change subject: update osmo-stp.cfg to make STP_Tests work at all again ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38021/comment/143eaf3d_ac0d… : PS1, Line 12: I'm really getting tired at fixing up those kind of issues. It's : well-known that config changes must be made first here and then in : docker-playground. > But `osmo-stp-tcp.confmerge` was there in osmo-ttcn3-hacks.git since March. […] The good side of things is that we are already moving several of those testsuites from docker-playground.git to osmo-ttcn3-hacks.git :) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38021?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: I7f0cef55a9a54f1cc4b23df781dab2afd52aae78 Gerrit-Change-Number: 38021 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 04 Sep 2024 11:37:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log