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

Change in osmo-bsc[master]: add counter for inter-BSC incoming Handover Request

by fixeria

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27371 ) Change subject: add counter for inter-BSC incoming Handover Request ...................................................................... Patch Set 2: -Code-Review -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icdde2bb339a5e367a4d297802214a1ef3f36eefa Gerrit-Change-Number: 27371 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 09:52:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-bsc[master]: add counter for inter-BSC incoming Handover Request

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27371 ) Change subject: add counter for inter-BSC incoming Handover Request ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: in general I find it completely strange that the type of SCCP transport layer message is part of the name of a BSSAP statistics item. Not sure what rationale this is following. I mean, if you count the number of HTTP GET requests in a web server, yo uwould also not put the TCP flags of the TCP header into the packet... -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icdde2bb339a5e367a4d297802214a1ef3f36eefa Gerrit-Change-Number: 27371 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 09:49:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-bsc[master]: support "empty" SCCP N-Connect from MSC

by osmith

Attention is currently required from: neels. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27373 ) Change subject: support "empty" SCCP N-Connect from MSC ...................................................................... Patch Set 3: (1 comment) Patchset: PS1: > @osmith […] => https://gerrit.osmocom.org/c/osmo-ci/+/27379 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I535c791fa01e99a2226392eb05f676ba6c3cc16e Gerrit-Change-Number: 27373 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 09:49:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-ci[master]: lint: checkpatch: don't require space in T=-1234

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/27379 ) Change subject: lint: checkpatch: don't require space in T=-1234 ...................................................................... lint: checkpatch: don't require space in T=-1234 Inside struct osmo_tdef we write non-spec timers as T=-1234. Do not complain about having no space before the minus character. Example: { .T=-25, .default_val=5, .desc="Timeout for ..." }, Note that the Linux kernel coding style also requires spaces around the equals signs. We follow that everywhere except for struct osmo_tdef, and the linter has already been adjusted for that in I1f0b9ed5bd49ef9b5ab0e347b9260e71df34ff9c. Change-Id: I0885e84ad99c7d333a5930c411fd1273badb0fcb --- M lint/checkpatch/checkpatch.pl 1 file changed, 10 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/79/27379/1 diff --git a/lint/checkpatch/checkpatch.pl b/lint/checkpatch/checkpatch.pl index d98d79c..eada2a9 100755 --- a/lint/checkpatch/checkpatch.pl +++ b/lint/checkpatch/checkpatch.pl @@ -5077,11 +5077,16 @@ $opv eq '*U' || $opv eq '-U' || $opv eq '&U') { # Osmocom specific: &&U removed if ($ctx !~ /[WEBC]x./ && $ca !~ /(?:\)|!|~|\*|-|\&|\||\+\+|\-\-|\{)$/) { - if (ERROR("SPACING", - "space required before that '$op' $at\n" . $hereptr)) { - if ($n != $last_after + 2) { - $good = $fix_elements[$n] . " " . ltrim($fix_elements[$n + 1]); - $line_fixed = 1; + # Osmocom specific: inside struct osmo_tdef we write non-spec timers as + # T=-1234. Do not complain about having no space before the minus + # character. + if ($opline !~ /\.T=/) { + if (ERROR("SPACING", + "space required before that '$op' $at\n" . $hereptr)) { + if ($n != $last_after + 2) { + $good = $fix_elements[$n] . " " . ltrim($fix_elements[$n + 1]); + $line_fixed = 1; + } } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0885e84ad99c7d333a5930c411fd1273badb0fcb Gerrit-Change-Number: 27379 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in osmo-bsc[master]: add counter for inter-BSC incoming Handover Request

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27371 ) Change subject: add counter for inter-BSC incoming Handover Request ...................................................................... Patch Set 2: Code-Review-1 (2 comments) Patchset: PS2: -1 to avoid fixeria's +2 to get this merged before addressing the naming issue File src/osmo-bsc/osmo_bsc_msc.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27371/comment/24a02c30_3becbe5f PS2, Line 58: [MSC_CTR_BSSMAP_RX_DT1_HANDOVER_RQST] = {"bssmap:rx:dt1:handover:rqst", "Number of received BSSMAP DT1 HANDOVER RQST messages"}, is the description and naming correct here? Are we really only counting those handover requests which we receive in DT1 vs. those that we receive directly in CR? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icdde2bb339a5e367a4d297802214a1ef3f36eefa Gerrit-Change-Number: 27371 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 09:46:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-bsc[master]: add missing counter increment for Perform Location Request

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27372 ) Change subject: add missing counter increment for Perform Location Request ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3f78ce73eb16fdff1f19359963405b2235000fc4 Gerrit-Change-Number: 27372 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 09:45:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-bsc[master]: tweak logl to ERROR for invalid initial BSSMAP

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27370 ) Change subject: tweak logl to ERROR for invalid initial BSSMAP ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idd7d763129a5acdf19cd0ae86e82b77ee0073f2f Gerrit-Change-Number: 27370 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 09:44:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: inter-BSC incoming HO in with empty SCCP CR

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27376 ) Change subject: bsc: inter-BSC incoming HO in with empty SCCP CR ...................................................................... bsc: inter-BSC incoming HO in with empty SCCP CR Test inter-BSC incoming HO where the Handover Request message is not included in the initial SCCP N-Connect, but follows in a separate DT1. Related: SYS#5864 Depends: I535c791fa01e99a2226392eb05f676ba6c3cc16e (osmo-bsc) Change-Id: I6732153cdd0d529bfaf0925387e765f3403a756b --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn M library/RAN_Emulation.ttcnpp 3 files changed, 29 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 907b436..f203d95 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -6009,12 +6009,18 @@ f_MscConnHdlr_init(g_pars.media_nr, "127.0.0.2", "127.0.0.3", FR_AMR); activate(as_Media()); - BSSAP.send(ts_BSSAP_Conn_Req(g_pars.sccp_addr_bsc, g_pars.sccp_addr_msc, - f_gen_handover_req(aoip_tla := g_pars.host_aoip_tla, - cell_id_source := g_pars.cell_id_source, - oldToNewBSSIEs := oldToNewBSSIEs, - enc := g_pars.encr))); - BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND); + var PDU_BSSAP ho_req := f_gen_handover_req(aoip_tla := g_pars.host_aoip_tla, + cell_id_source := g_pars.cell_id_source, + oldToNewBSSIEs := oldToNewBSSIEs, + enc := g_pars.encr); + if (g_pars.inter_bsc_ho_in__ho_req_in_initial_sccp_cr) { + BSSAP.send(ts_BSSAP_Conn_Req(g_pars.sccp_addr_bsc, g_pars.sccp_addr_msc, ho_req)); + BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND); + } else { + BSSAP.send(ts_BSSAP_Conn_Req(g_pars.sccp_addr_bsc, g_pars.sccp_addr_msc, omit)); + BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND); + BSSAP.send(ho_req); + } alt { [] BSSAP.receive(tr_BSSMAP_HandoverRequestAcknowledge(?)) -> value rx_bssap { @@ -6686,6 +6692,16 @@ f_shutdown_helper(); } +/* An incoming inter-BSC HO can either issue the Handover Request message attached to the initial SCCP N-Connect (as in + * the other tests we have so far), or the first CR can be "empty" with the BSSAP request following later. Test the + * empty N-Connect case. */ +testcase TC_ho_into_this_bsc_sccp_cr_without_bssap() runs on test_CT { + var TestHdlrParams pars := f_gen_test_hdlr_pars(); + pars.inter_bsc_ho_in__ho_req_in_initial_sccp_cr := false; + f_tc_ho_into_this_bsc_main(pars); + f_shutdown_helper(); +} + type record of charstring Commands; private function f_bts_0_cfg(TELNETasp_PT pt, Commands cmds := {}) @@ -11347,6 +11363,7 @@ execute( TC_ho_in_fail_msc_clears_after_ho_detect() ); execute( TC_ho_in_fail_no_detect() ); execute( TC_ho_in_fail_no_detect2() ); + execute( TC_ho_into_this_bsc_sccp_cr_without_bssap() ); execute( TC_ho_neighbor_config_1() ); execute( TC_ho_neighbor_config_2() ); diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 29b7783..95cdb7c 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -671,7 +671,8 @@ boolean expect_channel_mode_modify, uint3_t expect_tsc optional, BSSMAP_IE_CellIdentifier cell_id_source, - boolean expect_ho_fail + boolean expect_ho_fail, + boolean inter_bsc_ho_in__ho_req_in_initial_sccp_cr }; /* Note: Do not use valueof() to get a value of this template, use @@ -712,7 +713,8 @@ expect_channel_mode_modify := false, expect_tsc := omit, cell_id_source := valueof(ts_CellID_LAC_CI(1, 1)), - expect_ho_fail := false + expect_ho_fail := false, + inter_bsc_ho_in__ho_req_in_initial_sccp_cr := true } function f_create_chan_and_exp(template (present) PDU_BSSAP exp_l3_compl := ?) diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp index 295876e..d87ee9c 100644 --- a/library/RAN_Emulation.ttcnpp +++ b/library/RAN_Emulation.ttcnpp @@ -439,9 +439,9 @@ type record BSSAP_Conn_Req { SCCP_PAR_Address addr_peer, SCCP_PAR_Address addr_own, - PDU_BSSAP bssap + PDU_BSSAP bssap optional } -template BSSAP_Conn_Req ts_BSSAP_Conn_Req(SCCP_PAR_Address peer, SCCP_PAR_Address own, PDU_BSSAP bssap) := { +template BSSAP_Conn_Req ts_BSSAP_Conn_Req(SCCP_PAR_Address peer, SCCP_PAR_Address own, template (omit) PDU_BSSAP bssap) := { addr_peer := peer, addr_own := own, bssap := bssap -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27376 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: I6732153cdd0d529bfaf0925387e765f3403a756b Gerrit-Change-Number: 27376 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: inter-BSC HO in: expect codecs in HO Request ACK

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27311 ) Change subject: bsc: inter-BSC HO in: expect codecs in HO Request ACK ...................................................................... bsc: inter-BSC HO in: expect codecs in HO Request ACK Expect IEs Speech Codec (Chosen) and Codec List (BSS Supported), they are missing in current osmo-bsc. Related: SYS#5839 Depends: I3c0576505a3ceb3cd5cc31dc69c5bc4a86a4ea08 (osmo-bsc) Change-Id: Ib2b4e27be241e2a92c0c3bffdf906bf22c09352b --- M bsc/BSC_Tests.ttcn 1 file changed, 26 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 45c3239..6aefde5 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -6027,6 +6027,32 @@ f_verify_encr_info(chan_act); f_chan_act_verify_tsc(chan_act, expect_target_tsc); + if (ispresent(rx_bssap.pdu.bssmap.handoverRequestAck.codecList)) { + if (not g_pars.aoip) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "handoverRequestAck: Expected no Speech Codec List (BSS Supported), because this is not AoIP"); + } + /* TODO: check actual codecs? */ + } else { + if (g_pars.aoip) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "handoverRequestAck: Expected Speech Codec List (BSS Supported), but none found"); + } + } + + if (ispresent(rx_bssap.pdu.bssmap.handoverRequestAck.speechCodec)) { + if (not g_pars.aoip) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "handoverRequestAck: Expected no Speech Codec (Chosen), because this is not AoIP"); + } + /* TODO: check actual codec? */ + } else { + if (g_pars.aoip) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "handoverRequestAck: Expected Speech Codec (Chosen), but none found"); + } + } + ho_command_str := rx_bssap.pdu.bssmap.handoverRequestAck.layer3Information.layer3info; log("Received L3 Info in HO Request Ack: ", ho_command_str); var PDU_ML3_NW_MS ho_command := dec_PDU_ML3_NW_MS(ho_command_str); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27311 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: Ib2b4e27be241e2a92c0c3bffdf906bf22c09352b Gerrit-Change-Number: 27311 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(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> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: add TC_ho_into_this_bsc_a5_mismatch

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27247 ) Change subject: bsc: add TC_ho_into_this_bsc_a5_mismatch ...................................................................... bsc: add TC_ho_into_this_bsc_a5_mismatch Since I just fixed the encryption behavior, I also want to know whether the case of no A5 intersection is handled properly. The tiny test comes with a lot of changes to allow a handover failure code path. The 'expect_ho_fail' flag goes via function arguments to g_pars and the general ho test code uses it to branch for exp-failure. Related: SYS#5839 Change-Id: I44b464a0bedbff09c467c4bccd7c985480fb883a --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 58 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 6aefde5..907b436 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -5993,6 +5993,7 @@ } private function f_ho_into_this_bsc(charstring id, template (omit) BSSMAP_oldToNewBSSIEs oldToNewBSSIEs := omit) runs on MSC_ConnHdlr { + var PDU_BSSAP rx_bssap; /* Hack: the proper way would be to wait for the BSSMAP Handover Request ACK and extract the * actual assigned chan_nr from its L3 (RR Handover Command) message. But osmo-bsc starts acting * on the lchan even before we get a chance to evaluate the BSSMAP Handover Request ACK. So we @@ -6015,13 +6016,28 @@ enc := g_pars.encr))); BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND); + alt { + [] BSSAP.receive(tr_BSSMAP_HandoverRequestAcknowledge(?)) -> value rx_bssap { + if (g_pars.expect_ho_fail) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Expected Handover Request to fail, but got Handover Request Ack") + } + } + [] BSSAP.receive(tr_BSSMAP_HandoverFailure) -> value rx_bssap { + if (not g_pars.expect_ho_fail) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Expected Handover Request to succeed, but got Handover Failure") + } + // TODO: evaluate correct cause value. But osmo-bsc doesn't seem to send meaningful causes yet! + // For now just accept any cause. + BSSAP.receive(tr_BSSMAP_ClearRequest); + setverdict(pass); + return; + } + } + /* The RSL Emulation magically accepts the Chan Activ behind the scenes. */ - var PDU_BSSAP rx_bssap; - var octetstring ho_command_str; - - BSSAP.receive(tr_BSSMAP_HandoverRequestAcknowledge(?)) -> value rx_bssap; - /* we're sure that the channel activation is done now, verify the parameters in it */ var RSL_Message chan_act := f_rslem_get_last_act(RSL_PROC, 0, g_chan_nr); f_verify_encr_info(chan_act); @@ -6053,6 +6069,7 @@ } } + var octetstring ho_command_str; ho_command_str := rx_bssap.pdu.bssmap.handoverRequestAck.layer3Information.layer3info; log("Received L3 Info in HO Request Ack: ", ho_command_str); var PDU_ML3_NW_MS ho_command := dec_PDU_ML3_NW_MS(ho_command_str); @@ -6112,7 +6129,11 @@ exp_rr_rel_tmpl := tr_RRM_RR_RELEASE; } f_ho_into_this_bsc(id, oldToNewBSSIEs); - f_perform_clear(exp_rr_rel_tmpl := exp_rr_rel_tmpl); + if (g_pars.expect_ho_fail) { + f_perform_clear_no_lchan(); + } else { + f_perform_clear(exp_rr_rel_tmpl := exp_rr_rel_tmpl); + } setverdict(pass); } function f_tc_ho_into_this_bsc_main(TestHdlrParams pars, charstring vty_a5_cfg := VTY_A5_DEFAULT) runs on test_CT { @@ -6131,9 +6152,14 @@ vc_conn.done; f_ctrs_bsc_and_bts_add(0, "handover:attempted"); - f_ctrs_bsc_and_bts_add(0, "handover:completed"); f_ctrs_bsc_and_bts_add(0, "interbsc_ho_in:attempted"); - f_ctrs_bsc_and_bts_add(0, "interbsc_ho_in:completed"); + if (pars.expect_ho_fail) { + f_ctrs_bsc_and_bts_add(0, "handover:failed"); + f_ctrs_bsc_and_bts_add(0, "interbsc_ho_in:failed"); + } else { + f_ctrs_bsc_and_bts_add(0, "handover:completed"); + f_ctrs_bsc_and_bts_add(0, "interbsc_ho_in:completed"); + } f_ctrs_bsc_and_bts_verify(); f_vty_encryption_a5_reset(); @@ -6145,9 +6171,11 @@ f_shutdown_helper(); } -function f_tc_ho_into_this_bsc_a5(TestHdlrEncrParams encr, charstring vty_a5_cfg := VTY_A5_DEFAULT) runs on test_CT { +function f_tc_ho_into_this_bsc_a5(TestHdlrEncrParams encr, charstring vty_a5_cfg := VTY_A5_DEFAULT, + boolean expect_fail := false) runs on test_CT { var TestHdlrParams pars := f_gen_test_hdlr_pars(); pars.encr := encr; + pars.expect_ho_fail := expect_fail; f_tc_ho_into_this_bsc_main(pars, vty_a5_cfg); f_shutdown_helper(); } @@ -6184,6 +6212,12 @@ f_tc_ho_into_this_bsc_a5(f_encr_params(alg_permitted := '0a'O, alg_expect := '08'O)); } +/* Send a permitted algo mask that does not intersect with osmo-bsc.cfg */ +testcase TC_ho_into_this_bsc_a5_mismatch() runs on test_CT { + f_tc_ho_into_this_bsc_a5(f_encr_params(alg_permitted := '18'O, alg_expect := '10'O), "0 1", + expect_fail := true); // 0x18 = A5/3 and A5/4 +} + testcase TC_ho_into_this_bsc_tla_v6() runs on test_CT { var TestHdlrParams pars := f_gen_test_hdlr_pars(); pars.host_aoip_tla := "::6"; @@ -8026,6 +8060,16 @@ deactivate(ack_rel_req); } +friend function f_perform_clear_no_lchan() +runs on MSC_ConnHdlr { + f_logp(BSCVTY, "MSC instructs BSC to clear channel"); + BSSAP.send(ts_BSSMAP_ClearCommand(0)); + BSSAP.receive(tr_BSSMAP_ClearComplete); + f_logp(BSCVTY, "Got BSSMAP Clear Complete"); + /* Also drop the SCCP connection */ + BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ); +} + private function f_perform_clear_test_ct(DchanTuple dt) runs on test_CT { @@ -11290,6 +11334,7 @@ execute( TC_ho_into_this_bsc_a5_4() ); execute( TC_ho_into_this_bsc_a5_1_3_no_chosen_enc_alg() ); execute( TC_ho_into_this_bsc_a5_1_3() ); + execute( TC_ho_into_this_bsc_a5_mismatch() ); if (mp_bssap_cfg[0].transport == BSSAP_TRANSPORT_AoIP) { execute( TC_ho_into_this_bsc_tla_v6() ); } diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index e492ee0..29b7783 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -670,7 +670,8 @@ boolean exp_fast_return, /* RR Release expected to contain CellSelectInd ? */ boolean expect_channel_mode_modify, uint3_t expect_tsc optional, - BSSMAP_IE_CellIdentifier cell_id_source + BSSMAP_IE_CellIdentifier cell_id_source, + boolean expect_ho_fail }; /* Note: Do not use valueof() to get a value of this template, use @@ -710,7 +711,8 @@ exp_fast_return := false, expect_channel_mode_modify := false, expect_tsc := omit, - cell_id_source := valueof(ts_CellID_LAC_CI(1, 1)) + cell_id_source := valueof(ts_CellID_LAC_CI(1, 1)), + expect_ho_fail := false } function f_create_chan_and_exp(template (present) PDU_BSSAP exp_l3_compl := ?) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27247 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: I44b464a0bedbff09c467c4bccd7c985480fb883a Gerrit-Change-Number: 27247 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2022