March 2023 - gerrit-log - lists.osmocom.org

[M] Change in libosmocore[master]: logging: use enum to set timestamp format

by neels

neels has removed a vote from this change. ( https://gerrit.osmocom.org/c/libosmocore/+/5857 ) Change subject: logging: use enum to set timestamp format ...................................................................... Removed Code-Review-2 by neels <nhofmeyr(a)sysmocom.de> -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/5857 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I70ecee543c266df54191d3e86401466cd1a5c0a6 Gerrit-Change-Number: 5857 Gerrit-PatchSet: 5 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: deleteVote

2 years, 3 months

1
0
0 0

[M] Change in osmo-msc[master]: 3G: decapsulate IuUP to AMR at the MGW; allow 3G<-AMR->2G

by neels

Attention is currently required from: laforge. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/32069 ) Change subject: 3G: decapsulate IuUP to AMR at the MGW; allow 3G<-AMR->2G ...................................................................... Patch Set 3: Code-Review+2 (1 comment) Patchset: PS3: combine votes -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/32069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I386a6a426c318040b019ab5541689c67e94672a1 Gerrit-Change-Number: 32069 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 28 Mar 2023 02:45:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

[M] Change in osmo-msc[master]: 3G: decapsulate IuUP to AMR at the MGW; allow 3G<-AMR->2G

by neels

Attention is currently required from: laforge. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/32069 ) Change subject: 3G: decapsulate IuUP to AMR at the MGW; allow 3G<-AMR->2G ...................................................................... Patch Set 3: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-msc/+/32069/comment/1b3cea0c_a38189ae PS1, Line 9: plain AMR/RTP on the MSC's MGW hop. > I presume by this you mean the "core" side connection of the msc-colocated MGW? I.e. […] i explain in much more detail in the commit log of the latest patch set -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/32069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I386a6a426c318040b019ab5541689c67e94672a1 Gerrit-Change-Number: 32069 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(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: Tue, 28 Mar 2023 02:45:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

[M] Change in osmo-msc[master]: 3G: decapsulate IuUP to AMR at the MGW; allow 3G<-AMR->2G

by neels

Attention is currently required from: neels. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/32069 to look at the new patch set (#3). Change subject: 3G: decapsulate IuUP to AMR at the MGW; allow 3G<-AMR->2G ...................................................................... 3G: decapsulate IuUP to AMR at the MGW; allow 3G<-AMR->2G For all 3G calls, convert IuUP <-> plain AMR/RTP on the MSC's MGW hop like this: Before this patch: hNodeB <--IuUP--> MGW@hnbgw <--IuUP--> MGW@msc <--IuUP--> other call leg After this patch: hNodeB <--IuUP--> MGW@hnbgw <--IuUP--> MGW@msc <--AMR--> other call leg ^ This allows, in principle, 2G to 3G calls without expensive transcoding, like this: hNodeB <--IuUP--> MGW@hnbgw <--IuUP--> MGW@msc <--AMR--> MGW@msc <--AMR--> MGW@bsc <--AMR--> 2G-BTS ^ (So far only proven to work with AMR-FR at 12k2.) 3G to 3G calls now look like this: hNodeB <--IuUP--> MGW@hnbgw <--IuUP--> MGW@MSC <--AMR--> MGW@MSC <--IuUP--> MGW@hnbgw <--IuUP--> hNodeB ^ Implementatino: get rid of the shim that was put in place to still send IuUP (VND.3GPP.IUFP) to the CN. So now, for all 3G voice, the IuUP gets decapsulated to plain AMR/RTP at the MSC's MGW hop. What is proven to work with this patch: successful voice call between 2G and 3G with these conditions: - a hNodeB that stubbornly accepts only 12k2 AMR; - a 2G BTS configured to use only TCH/F and only FR3, with only 12k2 as allowed AMR rate. We have not yet seen a call working for TCH/H HR3 <-> 3G, because of the lab hNodeB's limitation to 12k2. Future work we probably need: - properly request and negotiate AMR rates via SDP fmtp:mode-set. - request more RFCIs in our RANAP RAB Assignment requests (see I61e0e9e75e3239662846fd797532acdefa9f73dc). - Convert IuUP to AMR already at the HNBGW's MGW? Solving this is not part of this patch. Related: SYS#5092 Change-Id: I386a6a426c318040b019ab5541689c67e94672a1 --- M src/libmsc/msc_a.c M tests/msc_vlr/msc_vlr_test_call.err 2 files changed, 119 insertions(+), 58 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/69/32069/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/32069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I386a6a426c318040b019ab5541689c67e94672a1 Gerrit-Change-Number: 32069 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

[M] Change in osmo-msc[master]: 3G: decapsulate IuUP to AMR at the MGW; allow 3G<-AMR->2G

by neels

Attention is currently required from: neels. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/32069 to look at the new patch set (#2). Change subject: 3G: decapsulate IuUP to AMR at the MGW; allow 3G<-AMR->2G ...................................................................... 3G: decapsulate IuUP to AMR at the MGW; allow 3G<-AMR->2G For all 3G calls, convert IuUP <-> plain AMR/RTP on the MSC's MGW hop like this: Before this patch: hNodeB <--IuUP--> MGW@hnbgw <--IuUP--> MGW@msc <--IuUP--> other call leg After this patch: hNodeB <--IuUP--> MGW@hnbgw <--IuUP--> MGW@msc <--AMR--> other call leg ^ This allows, in principle, 2G to 3G calls without expensive transcoding, like this: hNodeB <--IuUP--> MGW@hnbgw <--IuUP--> MGW@msc <--AMR--> MGW@bsc <--AMR--> 2G-BTS ^ (So far only proven to work with AMR-FR at 12k2.) 3G to 3G calls now look like this: hNodeB <--IuUP--> MGW@hnbgw <--IuUP--> MGW@MSC <--AMR--> MGW@MSC <--IuUP--> MGW@hnbgw <--IuUP--> hNodeB ^ Implementatino: get rid of the shim that was put in place to still send IuUP (VND.3GPP.IUFP) to the CN. So now, for all 3G voice, the IuUP gets decapsulated to plain AMR/RTP at the MSC's MGW hop. What is proven to work with this patch: successful voice call between 2G and 3G with these conditions: - a hNodeB that stubbornly accepts only 12k2 AMR; - a 2G BTS configured to use only TCH/F and only FR3, with only 12k2 as allowed AMR rate. We have not yet seen a call working for TCH/H HR3 <-> 3G, because of the lab hNodeB's limitation to 12k2. Future work we probably need: - properly request and negotiate AMR rates via SDP fmtp:mode-set. - request more RFCIs in our RANAP RAB Assignment requests (see I61e0e9e75e3239662846fd797532acdefa9f73dc). - Convert IuUP to AMR already at the HNBGW's MGW? Solving this is not part of this patch. Related: SYS#5092 Change-Id: I386a6a426c318040b019ab5541689c67e94672a1 --- M src/libmsc/msc_a.c M tests/msc_vlr/msc_vlr_test_call.err 2 files changed, 119 insertions(+), 58 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/69/32069/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/32069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I386a6a426c318040b019ab5541689c67e94672a1 Gerrit-Change-Number: 32069 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

[M] Change in osmo-msc[master]: fix msc_vlr_test_call SDP mncc_rtp

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/32068 ) Change subject: fix msc_vlr_test_call SDP mncc_rtp ...................................................................... fix msc_vlr_test_call SDP mncc_rtp In msc_vlr_test_call, we fail to send the right MNCC struct for MNCC_RTP_CREATE. We should pass a struct gsm_mncc_rtp. Fix that. Change-Id: Ia0b3253f85c716e45f925da3f58f025af1f15ec9 --- M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_call.err 2 files changed, 51 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve neels: Looks good to me, approved diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c index 2c67c1e..cb3c77b 100644 --- a/tests/msc_vlr/msc_vlr_test_call.c +++ b/tests/msc_vlr/msc_vlr_test_call.c @@ -207,6 +207,7 @@ struct gsm_mncc mncc = { .imsi = IMSI, }; + struct gsm_mncc_rtp mncc_rtp = {}; comment_start(); @@ -259,10 +260,10 @@ cc_to_mncc_expect_tx(IMSI, MNCC_SETUP_IND); crcx_ok(RTP_TO_CN); OSMO_ASSERT(cc_to_mncc_tx_confirmed); - mncc.callref = cc_to_mncc_tx_got_callref; + mncc.callref = mncc_rtp.callref = cc_to_mncc_tx_got_callref; btw("MNCC replies with MNCC_RTP_CREATE, causing MGW endpoint CRCX to RAN"); - mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc); + mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc_rtp); btw("MGW acknowledges the CRCX, triggering Assignment"); expect_iu_rab_assignment(); @@ -351,6 +352,10 @@ "a=ptime:20\r\n", }; + struct gsm_mncc_rtp mncc_rtp = { + .callref = 0x423, + }; + comment_start(); fake_time_start(); @@ -406,7 +411,7 @@ ms_sends_assignment_complete("AMR"); btw("MNCC sends MNCC_RTP_CREATE, which first waits for the CN side RTP"); - mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc); + mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc_rtp); btw("When the CN side RTP address is known, ack MNCC_RTP_CREATE with full SDP"); cc_to_mncc_expect_tx("", MNCC_RTP_CREATE); @@ -477,6 +482,19 @@ "a=ptime:20\r\n", }; + struct gsm_mncc_rtp mncc_rtp = { + .callref = 0x423, + .sdp = "v=0\r\n" + "o=OsmoMSC 0 0 IN IP4 10.23.23.1\r\n" + "s=GSM Call\r\n" + "c=IN IP4 10.23.23.1\r\n" + "t=0 0\r\n" + "m=audio 23 RTP/AVP 112\r\n" + "a=rtpmap:112 AMR/8000\r\n" + "a=fmtp:112 octet-align=1\r\n" + "a=ptime:20\r\n", + }; + comment_start(); fake_time_start(); @@ -522,7 +540,7 @@ OSMO_ASSERT(cc_to_mncc_tx_confirmed); btw("MNCC sends MNCC_RTP_CREATE, which first waits for the CN side RTP"); - mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc); + mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc_rtp); btw("MGW acknowledges the CRCX to RAN, triggering Assignment"); expect_iu_rab_assignment(); @@ -570,6 +588,8 @@ .imsi = IMSI, }; + struct gsm_mncc_rtp mncc_rtp = {}; + comment_start(); fake_time_start(); @@ -621,10 +641,10 @@ cc_to_mncc_expect_tx(IMSI, MNCC_SETUP_IND); crcx_ok(RTP_TO_CN); OSMO_ASSERT(cc_to_mncc_tx_confirmed); - mncc.callref = cc_to_mncc_tx_got_callref; + mncc.callref = mncc_rtp.callref = cc_to_mncc_tx_got_callref; btw("MNCC replies with MNCC_RTP_CREATE, causing MGW endpoint CRCX to RAN"); - mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc); + mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc_rtp); btw("MGW acknowledges the CRCX, triggering Assignment"); expect_iu_rab_assignment(); @@ -665,6 +685,7 @@ struct gsm_mncc mncc = { .imsi = IMSI, }; + struct gsm_mncc_rtp mncc_rtp = {}; comment_start(); @@ -717,10 +738,10 @@ cc_to_mncc_expect_tx(IMSI, MNCC_SETUP_IND); crcx_ok(RTP_TO_CN); OSMO_ASSERT(cc_to_mncc_tx_confirmed); - mncc.callref = cc_to_mncc_tx_got_callref; + mncc.callref = mncc_rtp.callref = cc_to_mncc_tx_got_callref; btw("MNCC replies with MNCC_RTP_CREATE, causing MGW endpoint CRCX to RAN"); - mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc); + mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc_rtp); btw("MGW acknowledges the CRCX, triggering Assignment"); expect_iu_rab_assignment(); @@ -1171,7 +1192,7 @@ .imsi = IMSI, }; - struct gsm_mncc_rtp *mncc_rtp = (void *)&mncc; + struct gsm_mncc_rtp mncc_rtp = {}; BTW("======================== MO call: %s", t->desc); btw("CM Service Request with Codec List (BSS Supported) =%s", @@ -1205,12 +1226,12 @@ cc_to_mncc_expect_tx(IMSI, MNCC_SETUP_IND); crcx_ok(RTP_TO_CN); OSMO_ASSERT(cc_to_mncc_tx_confirmed); - mncc.callref = cc_to_mncc_tx_got_callref; + mncc.callref = mncc_rtp.callref = cc_to_mncc_tx_got_callref; VALIDATE_SDP(cc_to_mncc_tx_last_sdp, t->mo_tx_sdp_mncc_setup_ind); btw("MNCC replies with MNCC_RTP_CREATE, causing MGW endpoint CRCX to RAN"); - sdp_str_from_subtype_names(mncc_rtp->sdp, sizeof(mncc_rtp->sdp), t->mo_rx_sdp_mncc_rtp_create); - mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc); + sdp_str_from_subtype_names(mncc_rtp.sdp, sizeof(mncc_rtp.sdp), t->mo_rx_sdp_mncc_rtp_create); + mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc_rtp); btw("MGW acknowledges the CRCX, triggering Assignment with%s", perm_speech_name(t->mo_tx_assignment_perm_speech)); expect_bssap_assignment(); @@ -1283,7 +1304,9 @@ .speech_ver = { GSM48_BCAP_SV_FR, -1, }, }, }; - struct gsm_mncc_rtp *mncc_rtp = (void *)&mncc; + struct gsm_mncc_rtp mncc_rtp = { + .callref = 0x423, + }; BTW("======================== MT call: %s", t->desc); @@ -1373,8 +1396,8 @@ ms_sends_assignment_complete(t->mt_rx_assigned_codec); btw("MNCC sends MNCC_RTP_CREATE, which first waits for the CN side RTP"); - sdp_str_from_subtype_names(mncc_rtp->sdp, sizeof(mncc_rtp->sdp), t->mt_rx_sdp_mncc_rtp_create); - mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc); + sdp_str_from_subtype_names(mncc_rtp.sdp, sizeof(mncc_rtp.sdp), t->mt_rx_sdp_mncc_rtp_create); + mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc_rtp); btw("When the CN side RTP address is known, ack MNCC_RTP_CREATE"); cc_to_mncc_expect_tx("", MNCC_RTP_CREATE); diff --git a/tests/msc_vlr/msc_vlr_test_call.err b/tests/msc_vlr/msc_vlr_test_call.err index 2527ee0..0fb396d 100644 --- a/tests/msc_vlr/msc_vlr_test_call.err +++ b/tests/msc_vlr/msc_vlr_test_call.err @@ -1348,7 +1348,7 @@ a=fmtp:112 octet-align=1 a=ptime:20 -DMNCC trans(CC:MO_TERM_CALL_CONF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x423 tid-0) rx MNCC_RTP_CREATE +DMNCC trans(CC:MO_TERM_CALL_CONF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x423 tid-0) rx MNCC_RTP_CREATE (RTP=10.23.23.1:23{AMR:octet-align=1#112}) DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_COMMUNICATING}: Assignment for this trans already started earlier - MGW acknowledges the CRCX to RAN, triggering Assignment MGW --CRCX OK to RTP_TO_RAN--> MSC -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/32068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia0b3253f85c716e45f925da3f58f025af1f15ec9 Gerrit-Change-Number: 32068 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

[M] Change in osmo-msc[master]: fix msc_vlr_test_call SDP mncc_rtp

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/32068 ) Change subject: fix msc_vlr_test_call SDP mncc_rtp ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/32068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia0b3253f85c716e45f925da3f58f025af1f15ec9 Gerrit-Change-Number: 32068 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 28 Mar 2023 02:26:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: add f_pfcp_expect()

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31766 ) Change subject: hnbgw: add f_pfcp_expect() ...................................................................... hnbgw: add f_pfcp_expect() End the guessing when seeing "timeout of T_guard": set a precise failure verdict when an expected PFCP message did not arrive as expected. Change-Id: I2117475b695d486b1204d61e5bb21120a6187354 --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 38 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index cf0cd07..71761b5 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -1304,10 +1304,31 @@ } } +private function f_pfcp_expect(template (present) PDU_PFCP exp_rx) runs on ConnHdlr return PDU_PFCP +{ + var PDU_PFCP rx; + timer T := 5.0; + T.start; + alt { + [] PFCP.receive(exp_rx) -> value rx { + setverdict(pass); + } + [] PFCP.receive(PDU_PFCP:?) { + setverdict(fail, "Got an unexpected PFCP message, was waiting for ", exp_rx); + mtc.stop; + } + [] T.timeout { + setverdict(fail, "Timeout waiting for PFCP ", exp_rx); + mtc.stop; + } + } + T.stop; + return rx; +} + friend function f_tc_ps_rab_assignment_with_pfcp(charstring id, TestHdlrParams pars) runs on ConnHdlr { var RANAP_PDU tx; var RANAP_PDU rx; - timer T := 5.0; f_init_handler(pars); @@ -1316,7 +1337,7 @@ var PDU_PFCP m; var Node_ID upf_node_id := valueof(ts_PFCP_Node_ID_fqdn("\07osmocom\03org")); - PFCP.receive(tr_PFCP_Assoc_Setup_Req()) -> value m; + m := f_pfcp_expect(tr_PFCP_Assoc_Setup_Req()) PFCP.send(ts_PFCP_Assoc_Setup_Resp(m.sequence_number, upf_node_id, ts_PFCP_Cause(REQUEST_ACCEPTED), 1234)); @@ -1332,7 +1353,7 @@ BSSAP.send(tx); /* Expect PFCP Session Establishment Request. */ - PFCP.receive(tr_PFCP_Session_Est_Req()) -> value m; + m := f_pfcp_expect(tr_PFCP_Session_Est_Req()); var F_SEID hnbgw_f_seid := m.message_body.pfcp_session_establishment_request.CP_F_SEID; var PFCP_Session_Establishment_Request serq := m.message_body.pfcp_session_establishment_request; @@ -1371,9 +1392,8 @@ gtp_pars.access.remote.teid); tx := valueof(ts_RANAP_RabAssResp(rab_smdl)); RUA.send(tx); - T.start; - PFCP.receive(tr_PFCP_Session_Mod_Req(up_f_seid.seid)) -> value m; + m := f_pfcp_expect(tr_PFCP_Session_Mod_Req(up_f_seid.seid)); r := ts_PFCP_Session_Mod_Resp(m.sequence_number, hnbgw_f_seid.seid); PFCP.send(r); @@ -1387,7 +1407,7 @@ tx := valueof(ts_RANAP_IuReleaseComplete()); f_iuh2iu(tx); - PFCP.receive(tr_PFCP_Session_Del_Req(up_f_seid.seid)) -> value m; + m := f_pfcp_expect(tr_PFCP_Session_Del_Req(up_f_seid.seid)); PFCP.send(ts_PFCP_Session_Del_Resp(m.sequence_number, hnbgw_f_seid.seid)); f_sleep(2.0); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2117475b695d486b1204d61e5bb21120a6187354 Gerrit-Change-Number: 31766 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: add f_bssap_expect()

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31767 ) Change subject: hnbgw: add f_bssap_expect() ...................................................................... hnbgw: add f_bssap_expect() End the guessing when seeing "timeout of T_guard": set a precise failure verdict when an expected RANAP/SCCP ("BSSAP") message did not arrive as expected. Change-Id: I51c60ed8fcef83c98e6c62c9f62a8c3c665de860 --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 42 insertions(+), 41 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 71761b5..1c0b121 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -474,6 +474,28 @@ } } +private function f_bssap_expect(template (present) RANAP_PDU exp_rx) runs on ConnHdlr return RANAP_PDU +{ + var RANAP_PDU rx; + timer T := 5.0; + T.start; + alt { + [] BSSAP.receive(exp_rx) -> value rx { + setverdict(pass); + } + [] BSSAP.receive(RANAP_PDU:?) { + setverdict(fail, "Got an unexpected RANAP message on BSSAP port, was waiting for ", exp_rx); + mtc.stop; + } + [] T.timeout { + setverdict(fail, "Timeout waiting for RANAP on BSSAP port: ", exp_rx); + mtc.stop; + } + } + T.stop; + return rx; +} + /* send RANAP on Iuh and expect it to show up on Iu */ function f_iuh2iu(template (present) RANAP_PDU tx, template RANAP_PDU exp_rx := omit) runs on ConnHdlr return RANAP_PDU { @@ -485,17 +507,8 @@ } RUA.send(tx); - T.start; - alt { - [] BSSAP.receive(exp_rx) -> value rx { - setverdict(pass); - } - [] T.timeout { - setverdict(fail, "Timeout waiting for Iu ", exp_rx); - } - } - return rx; + return f_bssap_expect(exp_rx); } /* send RANAP on Iu and expect it to show up on Iuh */ @@ -560,16 +573,7 @@ } /* expect to receive it on the Iu side */ - T.start; - alt { - [] BSSAP.receive(exp_rx) -> value rx { - setverdict(pass); - } - [] T.timeout { - setverdict(fail, "Timeout waiting for Iu ", exp_rx); - } - } - return rx; + return f_bssap_expect(exp_rx); } /* 3GPP TS 48.006 9.2 Connection release: @@ -600,17 +604,10 @@ RUA.send(RUA_Disc_Req:{tx, cause}); /* expect to receive it on the Iu side */ - T.start; - alt { - [] BSSAP.receive(exp_rx) -> value rx { - } - [] T.timeout { - setverdict(fail, "Timeout waiting for Iu ", exp_rx); - return rx; - } - } + rx := f_bssap_expect(exp_rx); /* expect disconnect on the Iu side */ + T.start; alt { [] BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND) { setverdict(pass); @@ -969,13 +966,11 @@ var MgcpCommand mgcp_cmd; var RANAP_PDU tx; var template RAB_SetupOrModifiedList rab_smdl; - timer T := 5.0; /* Send back RAB Assignment Response via Iuh */ rab_smdl := ts_RAB_SMdL(t_RAB_id(23), f_ts_RAB_TLA(pars.hnb_rtp_ip), t_RAB_binding_port(pars.hnb_rtp_port)); tx := valueof(ts_RANAP_RabAssResp(rab_smdl)); RUA.send(tx); - T.start; interleave { /* Expect MDCX with IP/port from RAB Assignment Response */ @@ -1000,14 +995,7 @@ rab_smdl := ts_RAB_SMdL(t_RAB_id(23), f_ts_RAB_TLA(pars.mgw_conn_2.mgw_rtp_ip), t_RAB_binding_port(pars.mgw_conn_2.mgw_rtp_port)); tx := valueof(ts_RANAP_RabAssResp(rab_smdl)); - alt { - [] BSSAP.receive(tx) { - setverdict(pass); - } - [] T.timeout { - setverdict(fail, "Timeout waiting for Iuh ", tx); - } - } + f_bssap_expect(tx); } private altstep as_mgcp_dlcx(inout TestHdlrParams pars) runs on ConnHdlr { @@ -1398,7 +1386,7 @@ PFCP.send(r); rab_smdl := ts_RAB_SMdL_ps(t_RAB_id(23), f_ts_RAB_TLA(gtp_pars.core.local.addr), gtp_pars.core.local.teid); - BSSAP.receive(tr_RANAP_RabAssResp(rab_smdl)); + f_bssap_expect(tr_RANAP_RabAssResp(rab_smdl)); f_sleep(2.0); tx := valueof(ts_RANAP_IuReleaseCommand(ts_RanapCause_om_intervention)); @@ -1464,7 +1452,7 @@ RUA.send(tx); /* Expect on IuPS: unmodified RAB Assignment Response */ - BSSAP.receive(tr_RANAP_RabAssResp(rab_smdl)); + f_bssap_expect(tr_RANAP_RabAssResp(rab_smdl)); f_sleep(2.0); tx := valueof(ts_RANAP_IuReleaseCommand(ts_RanapCause_om_intervention)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31767 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I51c60ed8fcef83c98e6c62c9f62a8c3c665de860 Gerrit-Change-Number: 31767 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: add f_rua_expect()

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31765 ) Change subject: hnbgw: add f_rua_expect() ...................................................................... hnbgw: add f_rua_expect() End the guessing when seeing "timeout of T_guard": set a precise failure verdict when an expected RUA message did not arrive as expected. Change-Id: I29e6b7659ba53efee9f676197b502f79780ead7e --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 33 insertions(+), 23 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 5a2c72e..cf0cd07 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -501,24 +501,35 @@ /* send RANAP on Iu and expect it to show up on Iuh */ function f_iu2iuh(template (present) RANAP_PDU tx, template RANAP_PDU exp_rx := omit) runs on ConnHdlr return RANAP_PDU { - var RANAP_PDU rx; - timer T := 5.0; - if (istemplatekind(exp_rx, "omit")) { exp_rx := tx; } BSSAP.send(tx); - T.start; + return f_rua_expect(exp_rx) +} + +/* expect to receive a specific RUA message on Iuh */ +private function f_rua_expect(template (present) RANAP_PDU exp_rx) runs on ConnHdlr return RANAP_PDU +{ + var RANAP_PDU rx; + timer T := 5.0; + T.start; alt { [] RUA.receive(exp_rx) -> value rx { setverdict(pass); } + [] RUA.receive(RANAP_PDU:?) { + setverdict(fail, "Got an unexpected RUA message, was waiting for ", exp_rx); + mtc.stop; + } [] T.timeout { setverdict(fail, "Timeout waiting for Iuh ", exp_rx); + mtc.stop; } } + T.stop; return rx; } @@ -945,19 +956,13 @@ setverdict(fail, "Timeout waiting for MGCP"); } } + T.stop; /* Expect RAB Assignment Request with IP/port from CRCX ACK via Iuh */ rab_sml := ts_RAB_SML(t_RAB_id(23), f_ts_RAB_TLA(pars.mgw_conn_1.mgw_rtp_ip), t_RAB_binding_port(pars.mgw_conn_1.mgw_rtp_port)); tx := valueof(ts_RANAP_RabAssReq(rab_sml)); - alt { - [] RUA.receive(tx) { - setverdict(pass); - } - [] T.timeout { - setverdict(fail, "Timeout waiting for Iuh ", tx); - } - } + f_rua_expect(tx); } friend function f_rab_ass_resp(inout MgcpParameters pars) runs on ConnHdlr { @@ -1119,16 +1124,9 @@ setverdict(fail, "Timeout waiting for DLCX"); } } + T.stop; - alt { - [] RUA.receive(tx) { - setverdict(pass); - } - [] T.timeout { - setverdict(fail, "Timeout waiting for Iuh ", tx); - } - } - + f_rua_expect(tx); } testcase TC_rab_release() runs on test_CT { @@ -1365,7 +1363,7 @@ rab_sml := ts_RAB_SML_ps(t_RAB_id(23), f_ts_RAB_TLA(gtp_pars.access.local.addr), gtp_pars.access.local.teid); rx := valueof(ts_RANAP_RabAssReq(rab_sml)); - RUA.receive(rx); + f_rua_expect(rx); /* Send back RAB Assignment Response via Iuh */ var template RAB_SetupOrModifiedList rab_smdl; @@ -1436,7 +1434,7 @@ /* Expect on Iuh: unmodified RAB Assignment Request */ rx := valueof(ts_RANAP_RabAssReq(rab_sml)); - RUA.receive(rx); + f_rua_expect(rx); /* Send back RAB Assignment Response via Iuh */ var template RAB_SetupOrModifiedList rab_smdl; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I29e6b7659ba53efee9f676197b502f79780ead7e Gerrit-Change-Number: 31765 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2023