- gerrit-log - lists.osmocom.org

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

05 Sep '24

Attention is currently required from: fixeria. laforge 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: (1 comment) File src/osmocom/utils.py: https://gerrit.osmocom.org/c/python/pyosmocom/+/38023/comment/8fe2a513_88f7… : PS2, Line 151: other > `... […] I was under the impression that the builtin "dunder" method return values are never type-annotated. Otherwise you'd probably have to annotate every __init__ etc? Not sure if there's a PEP about that. As for the "other": I was thinking of Union[hexstr,str], but as the former is a subclass of the latter, str would work. Will make that chagne. -- 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 05 Sep 2024 10:21:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 0

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

05 Sep '24

Attention is currently required from: fixeria. laforge 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: (1 comment) File src/osmocom/utils.py: https://gerrit.osmocom.org/c/python/pyosmocom/+/38023/comment/96ebe076_de41… : PS2, Line 141: hexstr > Class names should use CamelCase in python (according to PEP 8): […] the "problem" then is that we already have osmocom.utils.Hexstr as a type for type annotations: "Hexstr = NewType('Hexstr', str)" Indeed, once we have a proper, hexstr type (as introduced by this patch) *and* ported over all of pySim to that, the former would no longer be neeed. But simply replacing the existin Hexstr with that new 'class Hexstr' you propose - I'm not sure what kind of fallout that would mean? -- 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 05 Sep 2024 10:19:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: hss: Initial validation of Prometheus metrics
by laforge 05 Sep '24

05 Sep '24

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38027?usp=email ) Change subject: hss: Initial validation of Prometheus metrics ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38027?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: I507537c66a031b67518294daa8338f3836a90d6b Gerrit-Change-Number: 38027 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 05 Sep 2024 10:16:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[L] Change in osmo-ttcn3-hacks[master]: Introduce Prometheus_Checker module
by laforge 05 Sep '24

05 Sep '24

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38026?usp=email ) Change subject: Introduce Prometheus_Checker module ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38026?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: Iec5544ba74978918f1bddba12971f69a1824683e Gerrit-Change-Number: 38026 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 05 Sep 2024 10:16:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: Misc_Helpers: Introduce API helper f_str_startswith
by laforge 05 Sep '24

05 Sep '24

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38025?usp=email ) Change subject: Misc_Helpers: Introduce API helper f_str_startswith ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38025?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: Iad392ac652714a54a25954ea697f082d55772aa8 Gerrit-Change-Number: 38025 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 05 Sep 2024 10:16:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-sip-connector[master]: sip.c: permit early media with both 183 and 180
by laforge 05 Sep '24

05 Sep '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/38039?usp=email ) Change subject: sip.c: permit early media with both 183 and 180 ...................................................................... sip.c: permit early media with both 183 and 180 So far we only attempted to extract SDP (and hence enable early media) when receiving a status code 183. However, SDP can also be provided with 180, see for example https://developer.signalwire.com/freeswitch/FreeSWITCH-Explained/Codecs-and… Change-Id: Ia0072080c2e0bfb8b2bf751a248d3410a7723e79 Closes: OS#6559 --- M src/sip.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/39/38039/1 diff --git a/src/sip.c b/src/sip.c index 99bab9f..374c3ed 100644 --- a/src/sip.c +++ b/src/sip.c @@ -82,7 +82,7 @@ return; /* Extract SDP for session in progress with matching codec */ - if (status == 183) + if (status == 183 || status == 180) sdp_extract_sdp(leg, sip, false); LOGP(DSIP, LOGL_INFO, "leg(%p) is now progressing.\n", leg); -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/38039?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ia0072080c2e0bfb8b2bf751a248d3410a7723e79 Gerrit-Change-Number: 38039 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

1 0

[S] Change in osmo-ttcn3-hacks[master]: library/PFCP_Emulation: add (optional) COMMON port
by fixeria 05 Sep '24

05 Sep '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38034?usp=email ) Change subject: library/PFCP_Emulation: add (optional) COMMON port ...................................................................... library/PFCP_Emulation: add (optional) COMMON port Change-Id: Id8e8564cd92aaf6c8f640fd94d7626db400c1e1d --- M library/PFCP_Emulation.ttcn 1 file changed, 30 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/34/38034/1 diff --git a/library/PFCP_Emulation.ttcn b/library/PFCP_Emulation.ttcn index c671095..98dad59 100644 --- a/library/PFCP_Emulation.ttcn +++ b/library/PFCP_Emulation.ttcn @@ -46,6 +46,9 @@ port PFCPEM_PT CLIENT; port PFCPEM_PROC_PT CLIENT_PROC; + /* Common port for Node Related Procedures */ + port PFCPEM_PT COMMON; + /* Configuration by the user */ var PFCP_Emulation_Cfg g_pfcp_cfg; @@ -123,6 +126,23 @@ g_conns := g_conns & { conn }; } +private function f_send_pdu(inout PDU_PFCP pdu) runs on PFCP_Emulation_CT { + if (pdu.sequence_number == 0) { + pdu.sequence_number := f_PFCPEM_next_sequence_nr(); + } + + var PFCP_Unitdata ud := { + peer := { + conn_id := g_pfcp_conn_id, + remote_name := g_pfcp_cfg.pfcp_remote_ip, + remote_port := g_pfcp_cfg.pfcp_remote_port + }, + pdu := pdu + }; + + PFCP.send(ud); +} + private function f_init(PFCP_Emulation_Cfg cfg) runs on PFCP_Emulation_CT { var Result res; @@ -161,31 +181,26 @@ if (vc_conn != null) { log("found destination ", vc_conn); CLIENT.send(ud.pdu) to vc_conn; - } else { + } else if (ispresent(ud.pdu.seid)) { log("sending to all conns: ", g_conns); for (var integer i := 0; i < lengthof(g_conns); i := i + 1) { CLIENT.send(ud.pdu) to g_conns[i].vc_conn; } + } else if (COMMON.checkstate("Connected")) { + log("sending via COMMON port"); + COMMON.send(ud.pdu); } } + [] COMMON.receive(PDU_PFCP:?) -> value pdu { + log("PFCP_Emulation main() COMMON.receive: ", pdu); + f_send_pdu(pdu); + } + [] CLIENT.receive(PDU_PFCP:?) -> value pdu sender vc_conn { log("PFCP_Emulation main() CLIENT.receive from ", vc_conn, ": ", pdu); - if (pdu.sequence_number == 0) { - pdu.sequence_number := f_PFCPEM_next_sequence_nr(); - } - ud := { - peer := { - conn_id := g_pfcp_conn_id, - remote_name := g_pfcp_cfg.pfcp_remote_ip, - remote_port := g_pfcp_cfg.pfcp_remote_port - }, - pdu := pdu - }; - + f_send_pdu(pdu); /* may update pdu.sequence_number */ f_PFCPEM_conn_add_or_update({vc_conn, pdu.seid, pdu.sequence_number}); - - PFCP.send(ud); } [] CLIENT_PROC.getcall(PFCPEM_register:{}) -> sender vc_conn { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38034?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id8e8564cd92aaf6c8f640fd94d7626db400c1e1d Gerrit-Change-Number: 38034 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: s1gw: rework f_pfcp_wait_assoc_setup() into f_ConnHdlr_pfcp_expect()
by fixeria 05 Sep '24

05 Sep '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38036?usp=email ) Change subject: s1gw: rework f_pfcp_wait_assoc_setup() into f_ConnHdlr_pfcp_expect() ...................................................................... s1gw: rework f_pfcp_wait_assoc_setup() into f_ConnHdlr_pfcp_expect() Generalize this function, so that it can be used to expect any PFCP PDUs, not just the Association Setup. Change-Id: If691cb9df72672eddfbafdd8e03ae09c81b1ce71 --- M s1gw/S1GW_ConnHdlr.ttcn 1 file changed, 12 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/36/38036/1 diff --git a/s1gw/S1GW_ConnHdlr.ttcn b/s1gw/S1GW_ConnHdlr.ttcn index bb2a309..61c2290 100644 --- a/s1gw/S1GW_ConnHdlr.ttcn +++ b/s1gw/S1GW_ConnHdlr.ttcn @@ -240,24 +240,27 @@ } } -private function f_pfcp_wait_assoc_setup(template (present) PDU_PFCP exp_rx := tr_PFCP_Assoc_Setup_Req(), - float wait_time := 10.0) -runs on ConnHdlr +function f_ConnHdlr_pfcp_expect(template (present) PDU_PFCP exp_rx := ?, + float Tval := 2.0) +runs on ConnHdlr return PDU_PFCP { - timer T := wait_time; - T.start; + var PDU_PFCP pdu; + timer T; + + T.start(Tval); alt { - [] as_pfcp_handle_assoc_setup_req(exp_rx); - [] PFCP.receive(PDU_PFCP:?) { + [] PFCP.receive(exp_rx) -> value pdu { T.stop; } + [] PFCP.receive(PDU_PFCP:?) -> value pdu { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - log2str("Got an unexpected PFCP message, was waiting for ", exp_rx)); + log2str("Got an unexpected PFCP PDU: ", pdu)); } [] T.timeout { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Timeout waiting for PFCP ", exp_rx)); } } - T.stop; + + return pdu; } function f_ConnHdlr_register_pfcp() runs on ConnHdlr -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38036?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If691cb9df72672eddfbafdd8e03ae09c81b1ce71 Gerrit-Change-Number: 38036 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: library/PFCP_Emulation: allow retrieving the Recovery Time Stamp
by fixeria 05 Sep '24

05 Sep '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38035?usp=email ) Change subject: library/PFCP_Emulation: allow retrieving the Recovery Time Stamp ...................................................................... library/PFCP_Emulation: allow retrieving the Recovery Time Stamp The Recovery Time Stamp is a mandatory IE for some PDUs, such as: * Heartbeat Request/Response * PFCP Association Setup Request/Response Allow the PFCP_ConnHdlr components to retrieve its value, so that they can include it in outgoing (and expect in incoming) PDUs. Change-Id: I23eb2b4e309460f93183df83cdd35e46a93fbb94 --- M library/PFCP_Emulation.ttcn 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/35/38035/1 diff --git a/library/PFCP_Emulation.ttcn b/library/PFCP_Emulation.ttcn index 98dad59..280435e 100644 --- a/library/PFCP_Emulation.ttcn +++ b/library/PFCP_Emulation.ttcn @@ -208,6 +208,11 @@ f_PFCPEM_conn_add_or_update({vc_conn, omit, omit}); CLIENT_PROC.reply(PFCPEM_register:{}) to vc_conn; } + + [] CLIENT_PROC.getcall(PFCPEM_get_recovery_timestamp:{?}) -> sender vc_conn { + log("PFCP_Emulation main() CLIENT_PROC.getcall(PFCPEM_get_recovery_timestamp)"); + CLIENT_PROC.reply(PFCPEM_get_recovery_timestamp:{g_recovery_timestamp}) to vc_conn; + } } } } @@ -221,9 +226,11 @@ } with { extension "internal" }; signature PFCPEM_register(); +signature PFCPEM_get_recovery_timestamp(out integer rts); type port PFCPEM_PROC_PT procedure { inout PFCPEM_register; + inout PFCPEM_get_recovery_timestamp; } with { extension "internal" }; /*********************************************************************** @@ -241,6 +248,17 @@ } } +function f_pfcp_get_recovery_timestamp() +runs on PFCP_ConnHdlr return integer { + var integer rts; + + PFCP_PROC.call(PFCPEM_get_recovery_timestamp:{-}) { + [] PFCP_PROC.getreply(PFCPEM_get_recovery_timestamp:{?}) -> param(rts) {}; + } + + return rts; +} + altstep as_pfcp_ignore(PFCPEM_PT pt, template PDU_PFCP pfcp_expect := ?) { [] pt.receive(pfcp_expect) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38035?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I23eb2b4e309460f93183df83cdd35e46a93fbb94 Gerrit-Change-Number: 38035 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: s1gw: use the COMMON PFCP port
by fixeria 05 Sep '24

05 Sep '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38038?usp=email ) Change subject: s1gw: use the COMMON PFCP port ...................................................................... s1gw: use the COMMON PFCP port Change-Id: Ib12fd5e8f6aea9a94ec99a2c20f56057f7ac8905 --- M s1gw/S1GW_Tests.ttcn 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/38/38038/1 diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index 3c8dfb4..1d925be 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -50,6 +50,7 @@ timer g_Tguard; var S1AP_Server_CT vc_S1APSRV; var PFCP_Emulation_CT vc_PFCP; + port PFCPEM_PT PFCP; }; private altstep as_Tguard() runs on test_CT { @@ -92,6 +93,7 @@ }; vc_PFCP := PFCP_Emulation_CT.create("PFCP-" & testcasename()) alive; + connect(vc_PFCP:COMMON, self:PFCP); vc_PFCP.start(PFCP_Emulation.main(pfcp_cfg)); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38038?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib12fd5e8f6aea9a94ec99a2c20f56057f7ac8905 Gerrit-Change-Number: 38038 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log