- gerrit-log - lists.osmocom.org

Change in dahdi-linux[master]: vpmadt032: Create .o.cmd file for the shipped object file.
by laforge 24 Jan '22

24 Jan '22

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/26970 ) Change subject: vpmadt032: Create .o.cmd file for the shipped object file. ...................................................................... vpmadt032: Create .o.cmd file for the shipped object file. Kernel version 5.8, in commit "modpost: use read_text_file() and get_line() for reading text files" [1] made it an error if the .o.cmd file is missing. However, this file is not generated for shipped .o files. [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… Signed-off-by: Shaun Ruffell <sruffell(a)sruffell.net> Change-Id: I06d201bcd07b35cb41c8c4a8467bcad6471c431a --- M drivers/dahdi/Kbuild 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/70/26970/1 diff --git a/drivers/dahdi/Kbuild b/drivers/dahdi/Kbuild index 958e070..6a90fee 100644 --- a/drivers/dahdi/Kbuild +++ b/drivers/dahdi/Kbuild @@ -133,6 +133,7 @@ ifneq ($(DAHDI_ARCH),) ifneq ($(wildcard $(src)/vpmadt032_loader/vpmadt032_$(DAHDI_ARCH).o_shipped),) + $(shell touch $(KBUILD_EXTMOD)/vpmadt032_loader/.vpmadt032_$(DAHDI_ARCH).o.cmd) VPMADT032_LOADER_PRESENT=yes dahdi_vpmadt032_loader-objs += vpmadt032_loader/vpmadt032_$(DAHDI_ARCH).o obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_VPMADT032_LOADER) += dahdi_vpmadt032_loader.o -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/26970 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I06d201bcd07b35cb41c8c4a8467bcad6471c431a Gerrit-Change-Number: 26970 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

Change in osmo-ttcn3-hacks[master]: bsc: logp("start") also for handler_mode := false
by laforge 23 Jan '22

23 Jan '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26969 ) Change subject: bsc: logp("start") also for handler_mode := false ...................................................................... bsc: logp("start") also for handler_mode := false Change-Id: I4421a674055cd7013d21c52e9de6e369d1a72b6b --- M bsc/BSC_Tests.ttcn 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index fe6d1b2..634e629 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1227,6 +1227,9 @@ for (var integer i := 0; i < nr_bts; i := i+1) { f_init_bts(i, handler_mode); } + + /* Emit a marker to appear in the SUT's own logging output */ + f_logp(BSCVTY, testcasename() & "() start"); } function f_init_bts(integer bts_idx := 0, boolean handler_mode := false) @@ -3704,8 +3707,6 @@ function f_start_handler_run(MSC_ConnHdlr vc_conn, void_fn fn, template (omit) TestHdlrParams pars := omit) runs on test_CT return MSC_ConnHdlr { var charstring id := testcasename(); - /* Emit a marker to appear in the SUT's own logging output */ - f_logp(BSCVTY, id & "() start"); vc_conn.start(f_handler_init(fn, id, pars)); return vc_conn; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26969 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: I4421a674055cd7013d21c52e9de6e369d1a72b6b Gerrit-Change-Number: 26969 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

Change in osmo-ttcn3-hacks[master]: bsc: logp("start") also for handler_mode := false
by laforge 23 Jan '22

23 Jan '22

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26969 ) Change subject: bsc: logp("start") also for handler_mode := false ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26969 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: I4421a674055cd7013d21c52e9de6e369d1a72b6b Gerrit-Change-Number: 26969 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Sun, 23 Jan 2022 10:29:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Build failure of network:osmocom:nightly/osmo-gbproxy in openSUSE_Factory_ARM/armv7l
by OBS Notification 23 Jan '22

23 Jan '22

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/o… Package network:osmocom:nightly/osmo-gbproxy failed to build in openSUSE_Factory_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-gbproxy Last lines of build log: [ 41s] [145/162] cumulate libosmogsm-devel-1.6.0.47.1d1a.202201230026-1.1 [ 41s] [146/162] cumulate libosmovty-devel-1.6.0.47.1d1a.202201230026-1.1 [ 41s] [147/162] cumulate libtool-2.4.6-8.20 [ 41s] [148/162] cumulate libutempter0-1.2.0-3.12 [ 41s] [149/162] cumulate libosmoctrl0-1.6.0.47.1d1a.202201230026-1.1 [ 41s] [150/162] cumulate libosmogb12-1.6.0.47.1d1a.202201230026-1.1 [ 41s] [151/162] cumulate post-build-checks-84.87+git20210304.df696a0-1.2 [ 41s] [152/162] cumulate pam-1.5.2-5.3 [ 41s] [153/162] cumulate gcc11-11.2.1+git1173-1.3 [ 41s] [154/162] cumulate gcc-11-4.3 [ 41s] [155/162] cumulate libopenssl-1_1-devel-1.1.1m-1.3 [ 41s] [156/162] cumulate libosmoctrl-devel-1.6.0.47.1d1a.202201230026-1.1 [ 41s] [157/162] cumulate libosmogb-devel-1.6.0.47.1d1a.202201230026-1.1 [ 41s] [158/162] cumulate pam_unix-1.5.2-5.3 [ 41s] [159/162] cumulate shadow-4.11.1-1.1 [ 41s] [160/162] cumulate util-linux-2.37.2-2.3 [ 41s] [161/162] cumulate gcc-PIE-11-4.3 [ 41s] [162/162] cumulate rpm-build-4.17.0-2.4 [ 41s] now installing cumulated packages [ 41s] error: .init_b_cache/bash-sh.rpm: signature region trailer: BAD, tag 0 type 0 offset 0 count 0 [ 41s] error: .init_b_cache/bash-sh.rpm cannot be installed [ 41s] exit ... [ 41s] ### VM INTERACTION START ### [ 44s] [ 8.722662][ T391] sysrq: Power Off [ 44s] [ 8.723214][ T208] reboot: Power down [ 44s] ### VM INTERACTION END ### [ 44s] [ 44s] obs-arm-10 failed "build osmo-gbproxy.spec" at Sun Jan 23 00:36:14 UTC 2022. [ 44s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

1 0

Change in libosmocore[master]: ports.h: add osmo-pfcp-tool ports
by neels 23 Jan '22

23 Jan '22

neels has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/26607 ) Change subject: ports.h: add osmo-pfcp-tool ports ...................................................................... ports.h: add osmo-pfcp-tool ports Related: SYS#5599 Change-Id: I8a5f437d934b9bda11ea593b50bd18c7d5d71ce9 --- M include/osmocom/ctrl/ports.h M include/osmocom/vty/ports.h 2 files changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve diff --git a/include/osmocom/ctrl/ports.h b/include/osmocom/ctrl/ports.h index d287940..b4bceef 100644 --- a/include/osmocom/ctrl/ports.h +++ b/include/osmocom/ctrl/ports.h @@ -32,4 +32,6 @@ #define OSMO_CTRL_PORT_HNODEB 4274 /* 4275: OSMO_VTY_PORT_UPF */ #define OSMO_CTRL_PORT_UPF 4276 +/* 4277: OSMO_VTY_PORT_PFCP_TOOL */ +#define OSMO_CTRL_PORT_PFCP_TOOL 4278 /* When adding/changing port numbers, keep docs and wiki in sync. See above. */ diff --git a/include/osmocom/vty/ports.h b/include/osmocom/vty/ports.h index 75ff86f..d3b1d7a 100644 --- a/include/osmocom/vty/ports.h +++ b/include/osmocom/vty/ports.h @@ -44,4 +44,6 @@ /* 4274 used by control interface */ #define OSMO_VTY_PORT_UPF 4275 /* 4276: OSMO_CTRL_PORT_UPF */ +#define OSMO_VTY_PORT_PFCP_TOOL 4277 +/* 4278: OSMO_CTRL_PORT_UPF */ /* When adding/changing port numbers, keep docs and wiki in sync. See above. */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26607 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8a5f437d934b9bda11ea593b50bd18c7d5d71ce9 Gerrit-Change-Number: 26607 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

1 0

Change in libosmocore[master]: ports.h: add osmo-pfcp-tool ports
by neels 23 Jan '22

23 Jan '22

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/26607 ) Change subject: ports.h: add osmo-pfcp-tool ports ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26607 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8a5f437d934b9bda11ea593b50bd18c7d5d71ce9 Gerrit-Change-Number: 26607 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-Comment-Date: Sun, 23 Jan 2022 00:25:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-ttcn3-hacks[master]: bsc: f_perform_clear: ack all DLCX and RSL REL REQ
by neels 23 Jan '22

23 Jan '22

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26620 ) Change subject: bsc: f_perform_clear: ack all DLCX and RSL REL REQ ...................................................................... bsc: f_perform_clear: ack all DLCX and RSL REL REQ ACK any MGCP DLCX or RLL REL REQ during f_perform_clear(), which makes it more universally applicable to invoke at the end of a test. Related: OS#5337 Change-Id: Ie5b77c266a5d8f47edd187c474df281a799a81de --- M bsc/BSC_Tests.ttcn 1 file changed, 20 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index d68cba2..34d3d03 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -7791,9 +7791,27 @@ } } +private altstep as_mgcp_ack_all_dlcx() runs on MSC_ConnHdlr { + var MgcpCommand mgcp_cmd; + [] MGCP.receive(tr_DLCX(?)) -> value mgcp_cmd { + MGCP.send(ts_DLCX_ACK2(mgcp_cmd.line.trans_id)); + repeat; + } +} + +private altstep as_rsl_ack_all_rel_req() runs on MSC_ConnHdlr { + var RslLinkId main_dcch := valueof(ts_RslLinkID_DCCH(0)); + [] RSL.receive(tr_RSL_REL_REQ(g_chan_nr, ?)) { + RSL.send(ts_RSL_REL_CONF(g_chan_nr, main_dcch)); + repeat; + } +} + friend function f_perform_clear(RSL_DCHAN_PT rsl_pt := RSL, RSLEM_PROC_PT rsl_proc_pt := RSL_PROC, template PDU_ML3_NW_MS exp_rr_rel_tmpl := tr_RRM_RR_RELEASE) runs on MSC_ConnHdlr { + var default ack_dlcx := activate(as_mgcp_ack_all_dlcx()); + var default ack_rel_req := activate(as_rsl_ack_all_rel_req()); f_logp(BSCVTY, "MSC instructs BSC to clear channel"); BSSAP.send(ts_BSSMAP_ClearCommand(0)); interleave { @@ -7814,6 +7832,8 @@ f_rslem_unregister(0, g_chan_nr, PT := rsl_proc_pt); } } + deactivate(ack_dlcx); + deactivate(ack_rel_req); } private function f_perform_compl_l3(RSL_DCHAN_PT rsl_pt, RSLEM_PROC_PT rsl_proc_pt, null-- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26620 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: Ie5b77c266a5d8f47edd187c474df281a799a81de Gerrit-Change-Number: 26620 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

1 0

Change in osmo-ttcn3-hacks[master]: bsc: properly clean up conn after each test
by neels 23 Jan '22

23 Jan '22

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26621 ) Change subject: bsc: properly clean up conn after each test ...................................................................... bsc: properly clean up conn after each test Make all tests clean up BSSAP conn and RSL link. Now all f_verify_talloc_count() in f_shutdown_helper() should pass, verifying no conn or bsc_subscr leaks. Related: OS#5337 Change-Id: I9396efcabc085d2850244c6468b83c5f3a3ff3a2 --- M bsc/BSC_Tests.ttcn 1 file changed, 163 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 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 34d3d03..fe6d1b2 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1633,6 +1633,7 @@ } [] BSSAP.receive { repeat; } } + f_perform_clear_test_ct(dt); f_shutdown_helper(); } @@ -1711,7 +1712,7 @@ /* Run everything required up to sending a caller-specified assignment command and expect response */ function f_assignment_exp(PDU_BSSAP ass_cmd, template PDU_BSSAP exp, charstring fail_text) -runs on test_CT { +runs on test_CT return DchanTuple { var BSSAP_N_CONNECT_ind rx_c_ind; var RSL_Message rx_rsl; var DchanTuple dt; @@ -1738,13 +1739,15 @@ } [] BSSAP.receive { repeat; } } + return dt; } testcase TC_assignment_csd() runs on test_CT { var template PDU_BSSAP exp_fail := tr_BSSMAP_AssignmentFail; var PDU_BSSAP ass_cmd := f_gen_ass_req(); ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelTypeCSD); //exp_fail.pdu.bssmap.assignmentFailure.cause.causeValue := int2bit(enum2int(GSM0808_CAUSE_REQ_CODEC_TYPE_OR_CONFIG_UNAVAIL), 7); - f_assignment_exp(ass_cmd, exp_fail, "BSC accepted Assignment for CSD"); + var DchanTuple dt := f_assignment_exp(ass_cmd, exp_fail, "BSC accepted Assignment for CSD"); + f_perform_clear_test_ct(dt); f_shutdown_helper(); } @@ -1753,7 +1756,8 @@ var PDU_BSSAP ass_cmd := f_gen_ass_req(); ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelTypeCTM); //exp_fail.pdu.bssmap.assignmentFailure.cause.causeValue := int2bit(enum2int(GSM0808_CAUSE_REQ_CODEC_TYPE_OR_CONFIG_UNAVAIL), 7); - f_assignment_exp(ass_cmd, exp_fail, "BSC accepted Assignment for Speech+CTM"); + var DchanTuple dt := f_assignment_exp(ass_cmd, exp_fail, "BSC accepted Assignment for Speech+CTM"); + f_perform_clear_test_ct(dt); f_shutdown_helper(); } @@ -1983,6 +1987,8 @@ {name := "TTCN3.bts.0.chan.rf_fail_sdcch", mtype := "c", min := 1, max := 1} }; f_statsd_expect(expect); + BSSAP.receive(tr_BSSMAP_ClearRequest); + f_perform_clear(); } testcase TC_stats_conn_fail() runs on test_CT { var TestHdlrParams pars := f_gen_test_hdlr_pars(); @@ -2445,6 +2451,7 @@ /* Send MT message: BSSAP -> RSL */ f_mt_l3_transceive(RSL, link_id, dlci, l3); } + f_perform_clear(); } testcase TC_tch_dlci_link_id_sapi() runs on test_CT { var TestHdlrParams pars := f_gen_test_hdlr_pars(); @@ -3556,8 +3563,10 @@ /* Expevct a CR with a matching Paging response on the A-Interface */ T.start; alt { - [] BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(rr_pag_resp))) { + [] BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(rr_pag_resp))) -> value rx_c_ind { setverdict(pass); + dt.sccp_conn_id := rx_c_ind.connectionId; + BSSAP.send(ts_BSSAP_CONNECT_res(dt.sccp_conn_id)); } [] BSSAP.receive { setverdict(fail, "Received unexpected message on A-Interface!"); @@ -3567,6 +3576,7 @@ } } + f_perform_clear_test_ct(dt); f_shutdown_helper(); } @@ -3738,6 +3748,7 @@ exp_compl.pdu.bssmap.assignmentComplete.aoIPTransportLayer := omit; f_establish_fully(ass_cmd, exp_compl); + f_perform_clear(); } testcase TC_ciph_mode_a5_0() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -3826,6 +3837,7 @@ ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); f_establish_fully(ass_cmd, exp_compl); + f_perform_clear(); } testcase TC_assignment_aoip_tla_v6() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -3848,6 +3860,7 @@ ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); f_establish_fully(ass_cmd, exp_compl); + f_perform_clear(); } testcase TC_assignment_fr_a5_0() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -3921,6 +3934,7 @@ /* Omit: ass_cmd.pdu.bssmap.assignmentRequest.codecList */ f_establish_fully(ass_cmd, exp_fail); + f_perform_clear(); } testcase TC_assignment_fr_a5_1_codec_missing() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -3952,6 +3966,7 @@ /* Start ciphering, expect Cipher Mode Reject */ f_cipher_mode(g_pars.encr, exp_fail := true); + f_perform_clear(); } testcase TC_assignment_fr_a5_not_sup() runs on test_CT { var TestHdlrParams pars := f_gen_test_hdlr_pars(); @@ -3983,6 +3998,7 @@ { name := "TTCN3.bsc.0.assignment.completed", mtype := "c", min := 1, max := 1} }; f_statsd_expect(expect); + f_perform_clear(); } testcase TC_assignment_sign() runs on test_CT { @@ -4125,6 +4141,10 @@ type record of CodecListTest CodecListTests private function f_TC_assignment_codec(charstring id) runs on MSC_ConnHdlr { + f_assignment_codec(id); +} + +private function f_assignment_codec(charstring id, boolean do_perform_clear := true) runs on MSC_ConnHdlr { var PDU_BSSAP ass_cmd := f_gen_ass_req(g_pars.use_osmux); var template PDU_BSSAP exp_compl := f_gen_exp_compl(g_pars.use_osmux); @@ -4179,6 +4199,10 @@ } } } + + if (do_perform_clear) { + f_perform_clear(); + } } private function f_TC_assignment_codec_fail(charstring id) runs on MSC_ConnHdlr { @@ -4195,6 +4219,7 @@ log("expecting ASS FAIL like this: ", exp_fail); f_establish_fully(ass_cmd, exp_fail); + f_perform_clear(); } const CounterNameVals counternames_bsc_bts_assignment := { @@ -4708,6 +4733,7 @@ ass_cmd.pdu.bssmap.assignmentRequest.channelType.speechId_DataIndicator := '05'O; ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecHR})); f_establish_fully(ass_cmd, exp_compl); + f_perform_clear(); } /* Allow FR only */ @@ -4720,6 +4746,7 @@ ass_cmd.pdu.bssmap.assignmentRequest.channelType.speechId_DataIndicator := '01'O; ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); f_establish_fully(ass_cmd, exp_compl); + f_perform_clear(); } /* Allow HR only (expect assignment failure) */ @@ -4732,6 +4759,7 @@ ass_cmd.pdu.bssmap.assignmentRequest.channelType.speechId_DataIndicator := '05'O; ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecHR})); f_establish_fully(ass_cmd, exp_fail); + f_perform_clear(); } /* Allow FR only (expect assignment failure) */ @@ -4744,6 +4772,7 @@ ass_cmd.pdu.bssmap.assignmentRequest.channelType.speechId_DataIndicator := '01'O; ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); f_establish_fully(ass_cmd, exp_fail); + f_perform_clear(); } /* Allow FR and HR, but prefer FR */ @@ -4757,6 +4786,7 @@ ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR, ts_CodecHR})); exp_compl.pdu.bssmap.assignmentComplete.speechVersion.speechVersionIdentifier := '0000101'B; /* Expect HR */ f_establish_fully(ass_cmd, exp_compl); + f_perform_clear(); } /* Allow FR and HR, but prefer HR */ @@ -4770,6 +4800,7 @@ ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecHR, ts_CodecFR})); exp_compl.pdu.bssmap.assignmentComplete.speechVersion.speechVersionIdentifier := '0000101'B; /* Expect HR */ f_establish_fully(ass_cmd, exp_compl); + f_perform_clear(); } /* Allow FR and HR, but prefer FR */ @@ -4783,6 +4814,7 @@ ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR, ts_CodecHR})); exp_compl.pdu.bssmap.assignmentComplete.speechVersion.speechVersionIdentifier := '0000001'B; /* Expect FR */ f_establish_fully(ass_cmd, exp_compl); + f_perform_clear(); } /* Allow FR and HR, but prefer HR */ @@ -4796,6 +4828,7 @@ ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecHR, ts_CodecFR})); exp_compl.pdu.bssmap.assignmentComplete.speechVersion.speechVersionIdentifier := '0000001'B; /* Expect FR */ f_establish_fully(ass_cmd, exp_compl); + f_perform_clear(); } /* Request a HR channel while all FR channels are exhausted, this is expected @@ -4921,6 +4954,7 @@ ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecHR, ts_CodecFR})); exp_compl.pdu.bssmap.assignmentComplete.speechVersion.speechVersionIdentifier := '0000101'B; /* Expect HR */ f_establish_fully(ass_cmd, exp_compl); + f_perform_clear(); } /* Allow FR and HR, but prefer FR */ @@ -4934,6 +4968,7 @@ ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR, ts_CodecHR})); exp_compl.pdu.bssmap.assignmentComplete.speechVersion.speechVersionIdentifier := '0000001'B; /* Expect FR */ f_establish_fully(ass_cmd, exp_compl); + f_perform_clear(); } /* Request a HR (prefered) or alternatively a FR channel, it is expected that @@ -4984,6 +5019,8 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for COMPLETE LAYER 3 INFORMATION"); } } + + f_perform_clear(); } testcase TC_assignment_sdcch_exhausted_req_signalling() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -5046,6 +5083,7 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for COMPLETE LAYER 3 INFORMATION"); } } + f_perform_clear(); } testcase TC_assignment_sdcch_exhausted_req_voice_tch_forbidden() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -5106,6 +5144,8 @@ f_rsl_send_l3(ts_RRM_CM_CHG(valueof(ts_CM2))); BSSAP.receive(tr_BSSMAP_ClassmarkUpd(?, omit)); setverdict(pass); + + f_perform_clear(); } testcase TC_classmark() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -5133,6 +5173,8 @@ f_vty_transceive_match_regexp_retry(BSCVTY, "show conns", regex, 0, 4, 1.0); setverdict(pass); + + f_perform_clear(); } testcase TC_common_id() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -5171,6 +5213,7 @@ private function f_tc_unsol_ass_fail(charstring id) runs on MSC_ConnHdlr { f_est_single_l3(ts_RRM_AssignmentFailure('00'O)); f_bssap_expect_nothing(); + f_perform_clear(); } testcase TC_unsol_ass_fail() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -5186,6 +5229,7 @@ private function f_tc_unsol_ass_compl(charstring id) runs on MSC_ConnHdlr { f_est_single_l3(ts_RRM_AssignmentComplete('00'O)); f_bssap_expect_nothing(); + f_perform_clear(); } testcase TC_unsol_ass_compl() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -5201,6 +5245,7 @@ private function f_tc_unsol_ho_fail(charstring id) runs on MSC_ConnHdlr { f_est_single_l3(ts_RRM_HandoverFailure('00'O)); f_bssap_expect_nothing(); + f_perform_clear(); } testcase TC_unsol_ho_fail() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -5221,6 +5266,7 @@ /* send short message */ RSL.send(ts_RSL_DATA_IND(g_chan_nr, valueof(ts_RslLinkID_DCCH(0)), ''O)); f_bssap_expect_nothing(); + f_perform_clear(); } testcase TC_err_82_short_msg() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -5243,6 +5289,7 @@ [] BSSAP.receive { setverdict(fail, "unexpected BSSAP"); } [] T.timeout { setverdict(fail, "Timeout waiting for RR STATUS"); } } + f_perform_clear(); } testcase TC_err_84_unknown_msg() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -5349,6 +5396,8 @@ f_chan_act_verify_tsc(chan_act, BTS_TSC[1]); + f_perform_clear(RSL1, RSL1_PROC); + f_sleep(0.5); } @@ -5499,7 +5548,9 @@ RSL1.send(ts_RSL_RF_CHAN_REL_ACK(new_chan_nr)); f_rslem_unregister(0, g_chan_nr, PT := RSL1_PROC); } - [] BSSAP.receive(tr_BSSMAP_ClearComplete) {} + [] BSSAP.receive(tr_BSSMAP_ClearComplete) { + BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ); + } } f_sleep(0.5); @@ -5615,7 +5666,9 @@ [] RSL.receive(tr_RSL_DATA_REQ(g_chan_nr, ?, decmatch tr_RRM_RR_RELEASE)); [] RSL.receive(tr_RSL_DEACT_SACCH(g_chan_nr)); [] RSL.receive(tr_RSL_RF_CHAN_REL(g_chan_nr)); - [] BSSAP.receive(tr_BSSMAP_ClearComplete); + [] BSSAP.receive(tr_BSSMAP_ClearComplete) { + BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ); + } } setverdict(pass); } @@ -5722,6 +5775,7 @@ f_mo_l3_transceive(); f_sleep(1.0); + f_perform_clear(); } testcase TC_ho_out_fail_no_msc_response() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -5803,6 +5857,7 @@ setverdict(pass); f_sleep(1.0); + f_perform_clear(); } testcase TC_ho_out_fail_rr_ho_failure() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -5900,6 +5955,7 @@ f_expect_dlcx_conns(); BSSAP.receive(tr_BSSMAP_ClearComplete); + BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ); setverdict(pass); f_sleep(1.0); @@ -6233,6 +6289,7 @@ f_expect_dlcx_conns(); BSSAP.receive(tr_BSSMAP_ClearComplete); + BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ); setverdict(pass); f_sleep(1.0); @@ -6326,6 +6383,7 @@ f_expect_dlcx_conns(); BSSAP.receive(tr_BSSMAP_ClearComplete); + BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ); f_sleep(1.0); } @@ -6415,6 +6473,7 @@ f_expect_dlcx_conns(); BSSAP.receive(tr_BSSMAP_ClearComplete); + BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ); f_sleep(1.0); } @@ -6496,6 +6555,7 @@ }; f_expect_dlcx_conns(); BSSAP.receive(tr_BSSMAP_ClearComplete); + BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ); f_sleep(1.0); } @@ -6711,6 +6771,8 @@ f_probe_for_handover("1.d", "HO to 871-11 still works (verify that this test properly cleans up)", "handover any to arfcn 871 bsic 11", true, expect_target_tsc := BTS_TSC[1]); + + f_perform_clear(); } testcase TC_ho_neighbor_config_1() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -6775,6 +6837,7 @@ f_probe_for_handover("2.b", "HO to bts 2 doesn't work, not listed as neighbor", "handover any to arfcn 871 bsic 12", false); + f_perform_clear(); } testcase TC_ho_neighbor_config_2() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -6826,6 +6889,7 @@ f_probe_for_handover("3.b", "HO to bts 2 works, explicitly listed as neighbor; no ambiguity because bts 3 is not listed as neighbor", "handover any to arfcn 871 bsic 12", true, expect_target_tsc := BTS_TSC[2]); + f_perform_clear(); } testcase TC_ho_neighbor_config_3() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -6880,6 +6944,7 @@ f_probe_for_handover("4.c", "HO to 123-45 triggers inter-BSC HO", "handover any to arfcn 123 bsic 45", true, true); + f_perform_clear(); } testcase TC_ho_neighbor_config_4() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -6930,6 +6995,7 @@ f_probe_for_handover("5.a", "HO to 871-12 triggers inter-BSC HO (ignoring local cells with same ARFCN+BSIC)", "handover any to arfcn 871 bsic 12", true, true); + f_perform_clear(); } testcase TC_ho_neighbor_config_5() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -6973,6 +7039,7 @@ f_probe_for_handover("6.a", "HO to 871-12 is ambiguous = error", "handover any to arfcn 871 bsic 12", false); + f_perform_clear(); } testcase TC_ho_neighbor_config_6() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -7017,6 +7084,7 @@ f_probe_for_handover("7.b", "HO to 123-45 triggers inter-BSC HO", "handover any to arfcn 123 bsic 45", true, true); + f_perform_clear(); } testcase TC_ho_neighbor_config_7() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -7478,9 +7546,11 @@ /* Fill TS0 SDCCH channels (NOTE: only 3 SDCCH/4 channels are available * on CCCH+SDCCH4+CBCH) */ + var DchanTuples sdcch_cleanup := {}; var integer i; for (i := 0; i < NUM_SDCCH_PER_BTS; i := i + 1) { dt := f_est_dchan('23'O, i, '00010203040506'O); + sdcch_cleanup := sdcch_cleanup & { dt }; } /* Now the dyn ts is selected. First PDCH is released, then sdcch chan is activated */ @@ -7512,6 +7582,11 @@ f_sleep(1.0); f_ts_dyn_mode_assert(0, 0, pdch_chan_nr.tn, PDCH_MODE); + /* Clean up SDCCH lchans */ + for (i := 0; i < lengthof(sdcch_cleanup); i := i + 1) { + f_perform_clear_test_ct(sdcch_cleanup[i]); + } + /* clean up config */ f_ts_set_chcomb(0, 0, 6, "PDCH"); @@ -7534,7 +7609,7 @@ } f_vty_transceive(BSCVTY, "drop bts connection 0 oml"); - f_init(1); + f_init(1, guard_timeout := 60.0); /* The dyn TS want to activate PDCH mode, ACK that. */ var RslChannelNr chan_nr; @@ -7548,15 +7623,21 @@ /* GSM 44.018 Table 9.1.8.2: * RA = '13'O -> Establishment cause = 0001xxxx (MS dual rate capable and asks for "SDCCH"). */ + var DchanTuples chan_cleanup := {}; for (i := 0; i < NUM_SDCCH_PER_BTS; i := i+1) { - f_est_dchan('13'O, NUM_SDCCH_PER_BTS + i, '00010203040506'O); + chan_cleanup := chan_cleanup & { f_est_dchan('13'O, NUM_SDCCH_PER_BTS + i, '00010203040506'O) }; } /* Only the dyn TS is still available. Its first lchan gets converted to SDCCH8 */ - f_est_dchan_dyn('33'O, NUM_SDCCH_PER_BTS + i, '00010203040506'O); + chan_cleanup := chan_cleanup & { f_est_dchan_dyn('33'O, NUM_SDCCH_PER_BTS + i, '00010203040506'O) }; /* Also occupy the seven other SDCCH of the dyn TS */ for (i := 0; i < 7; i := i+1) { - f_est_dchan('33'O, NUM_SDCCH_PER_BTS + i, '00010203040506'O); + chan_cleanup := chan_cleanup & { f_est_dchan('33'O, NUM_SDCCH_PER_BTS + i, '00010203040506'O) }; + } + + /* Clean up SDCCH lchans */ + for (i := 0; i < lengthof(chan_cleanup); i := i + 1) { + f_perform_clear_test_ct(chan_cleanup[i]); } /* clean up config */ @@ -7602,9 +7683,11 @@ /* Fill TS0 SDCCH channels (NOTE: only 3 SDCCH/4 channels are available * on CCCH+SDCCH4+CBCH) */ + var DchanTuples chan_cleanup := {}; var OCT1 ra := '43'O; /* RA containing reason=originating speech call*/ for (i := 0; i < NUM_SDCCH_PER_BTS; i := i + 1) { dt := f_est_dchan(ra, i, '00010203040506'O); + chan_cleanup := chan_cleanup & { dt }; } /* Now the dyn ts is selected. First PDCH is released, then TCH chan is activated */ @@ -7636,6 +7719,11 @@ f_sleep(1.0); f_ts_dyn_mode_assert(0, 0, pdch_chan_nr.tn, PDCH_MODE); + /* Clean up SDCCH lchans */ + for (i := 0; i < lengthof(chan_cleanup); i := i + 1) { + f_perform_clear_test_ct(chan_cleanup[i]); + } + /* clean up config */ f_ts_reset_chcomb(0); /* TODO: clean up other channels? */ @@ -7672,9 +7760,11 @@ /* Fill TS0 SDCCH channels (NOTE: only 3 SDCCH/4 channels are available * on CCCH+SDCCH4+CBCH) */ + var DchanTuples chan_cleanup := {}; var integer i; for (i := 0; i < NUM_SDCCH_PER_BTS; i := i + 1) { dt := f_est_dchan('23'O, i, '00010203040506'O); + chan_cleanup := chan_cleanup & { dt }; } /* Now the dyn ts is selected. First PDCH is released, then sdcch chan is activated */ @@ -7702,6 +7792,11 @@ * f_ts_dyn_mode_assert(0, 0, pdch_chan_nr.tn, PDCH_MODE) */ + /* Clean up SDCCH lchans */ + for (i := 0; i < lengthof(chan_cleanup); i := i + 1) { + f_perform_clear_test_ct(chan_cleanup[i]); + } + /* clean up config */ f_ts_set_chcomb(0, 0, 6, "PDCH"); @@ -7836,6 +7931,15 @@ deactivate(ack_rel_req); } +private function f_perform_clear_test_ct(DchanTuple dt) + runs on test_CT +{ + /* Instruct BSC to clear channel */ + var BssmapCause cause := 0; + BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSMAP_ClearCommand(cause))); + f_exp_chan_rel_and_clear(dt, 0); +} + private function f_perform_compl_l3(RSL_DCHAN_PT rsl_pt, RSLEM_PROC_PT rsl_proc_pt, template PDU_ML3_MS_NW l3_info, boolean do_clear := true, boolean expect_bssmap_l3 := true) runs on MSC_ConnHdlr { @@ -8578,6 +8682,7 @@ } setverdict(pass); + f_perform_clear(); } /* Test if the EMERGENCY SETUP gets blocked by the BSC if EMERGENCY CALLS are @@ -8600,6 +8705,8 @@ setverdict(fail, "timout waiting for RR CHANNEL RELEASE!"); } } + BSSAP.receive(tr_BSSMAP_ClearRequest); + f_perform_clear(); } /* EMERGENCY CALL situation #1, allowed globally and by BTS */ @@ -9087,6 +9194,8 @@ setverdict(fail, "FH disabled, but Mobile Allocation IE is present"); continue; } + + f_perform_clear_test_ct(dt); } /* Give the IUT some time to release all channels */ @@ -9158,6 +9267,8 @@ setverdict(fail, "FH enabled, but Mobile Allocation IE is absent"); return; } + + f_perform_clear_test_ct(dt); } testcase TC_fh_params_handover_cmd() runs on test_CT { var FHParamsTrx fhp := f_TC_fh_params_gen(); @@ -9899,6 +10010,8 @@ } } T.stop; + + f_perform_clear(); } /* The BSC does *not* indicate BTS_FEAT_VAMOS; make sure that a channel Mode Modify to VAMOS mode is refused by @@ -9948,7 +10061,7 @@ private function f_TC_reassignment_codec(charstring id) runs on MSC_ConnHdlr { /* First fully set up a speech lchan */ - f_TC_assignment_codec(id); + f_assignment_codec(id, do_perform_clear := false); /* Trigger re-assignment to another lchan */ var AssignmentState assignment_st := valueof(ts_AssignmentStateInit); @@ -10246,6 +10359,8 @@ /* First send the Chan Act ACK */ var RslChannelNr chan_nr := chan_act.ies[0].body.chan_nr; + var DchanTuple dt; + dt.rsl_chan_nr := chan_nr; var RSL_IE_Body chan_ident_ie; if (not f_rsl_find_ie(chan_act, RSL_IE_CHAN_IDENT, chan_ident_ie)) { setverdict(fail, "RSL Channel Identification IE is absent"); @@ -10266,9 +10381,11 @@ var BSSAP_N_CONNECT_ind rx_c_ind; BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(l3))) -> value rx_c_ind; + dt.sccp_conn_id := rx_c_ind.connectionId; BSSAP.send(ts_BSSAP_CONNECT_res(rx_c_ind.connectionId)); f_sleep(1.0); + f_perform_clear_test_ct(dt); f_shutdown_helper(); } @@ -10291,6 +10408,8 @@ chan_act := f_exp_ipa_rx(0, tr_RSL_MsgTypeD(RSL_MT_CHAN_ACTIV)); var RslChannelNr chan_nr := chan_act.ies[0].body.chan_nr; + var DchanTuple dt; + dt.rsl_chan_nr := chan_nr; var RSL_IE_Body chan_ident_ie; if (not f_rsl_find_ie(chan_act, RSL_IE_CHAN_IDENT, chan_ident_ie)) { setverdict(fail, "RSL Channel Identification IE is absent"); @@ -10311,9 +10430,11 @@ var BSSAP_N_CONNECT_ind rx_c_ind; BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(l3))) -> value rx_c_ind; + dt.sccp_conn_id := rx_c_ind.connectionId; BSSAP.send(ts_BSSAP_CONNECT_res(rx_c_ind.connectionId)); f_sleep(1.0); + f_perform_clear_test_ct(dt); f_shutdown_helper(); } @@ -10336,6 +10457,8 @@ chan_act := f_exp_ipa_rx(0, tr_RSL_MsgTypeD(RSL_MT_CHAN_ACTIV)); var RslChannelNr chan_nr := chan_act.ies[0].body.chan_nr; + var DchanTuple dt; + dt.rsl_chan_nr := chan_nr; var RSL_IE_Body chan_ident_ie; if (not f_rsl_find_ie(chan_act, RSL_IE_CHAN_IDENT, chan_ident_ie)) { setverdict(fail, "RSL Channel Identification IE is absent"); @@ -10356,9 +10479,11 @@ var BSSAP_N_CONNECT_ind rx_c_ind; BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(l3))) -> value rx_c_ind; + dt.sccp_conn_id := rx_c_ind.connectionId; BSSAP.send(ts_BSSAP_CONNECT_res(rx_c_ind.connectionId)); f_sleep(1.0); + f_perform_clear_test_ct(dt); f_shutdown_helper(); } @@ -10406,6 +10531,8 @@ /* Now activation as SDCCH8 */ chan_nr := valueof(t_RslChanNr_SDCCH8(tn := 6, sub_slot := 0)); + var DchanTuple dt; + dt.rsl_chan_nr := chan_nr; chan_act := f_exp_ipa_rx(0, tr_RSL_MsgTypeD(RSL_MT_CHAN_ACTIV)); var RSL_IE_Body chan_ident_ie; @@ -10428,9 +10555,11 @@ var BSSAP_N_CONNECT_ind rx_c_ind; BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(l3))) -> value rx_c_ind; + dt.sccp_conn_id := rx_c_ind.connectionId; BSSAP.send(ts_BSSAP_CONNECT_res(rx_c_ind.connectionId)); f_sleep(1.0); + f_perform_clear_test_ct(dt); f_shutdown_helper(); } @@ -10483,6 +10612,8 @@ /* Now activation as SDCCH8 */ chan_nr := valueof(t_RslChanNr_SDCCH8(tn := 6, sub_slot := 0)); + var DchanTuple dt; + dt.rsl_chan_nr := chan_nr; chan_act := f_exp_ipa_rx(0, tr_RSL_MsgTypeD(RSL_MT_CHAN_ACTIV)); var RSL_IE_Body chan_ident_ie; @@ -10501,9 +10632,11 @@ var BSSAP_N_CONNECT_ind rx_c_ind; BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(l3))) -> value rx_c_ind; + dt.sccp_conn_id := rx_c_ind.connectionId; BSSAP.send(ts_BSSAP_CONNECT_res(rx_c_ind.connectionId)); f_sleep(1.0); + f_perform_clear_test_ct(dt); f_shutdown_helper(); } @@ -10607,6 +10740,8 @@ f_create_chan_and_exp(); /* we should now have a COMPL_L3 at the MSC */ BSSAP.send(ts_PDU_DTAP_MT(ts_CM_SERV_REJ('02'O), '00'O)); + RSL.receive(tr_RSL_DATA_REQ(g_chan_nr, ?, decmatch tr_CM_SERV_REJ)); + f_perform_clear(); f_sleep(1.0); } testcase TC_cm_serv_rej() runs on test_CT { @@ -10733,15 +10868,16 @@ var integer i; var integer chreq_total, chreq_nochan; - f_init(1); + f_init(1, guard_timeout := 60.0); f_sleep(1.0); /* Exhaust all dedicated SDCCH lchans. /* GSM 44.018 Table 9.1.8.2: * RA = '13'O -> Establishment cause = 0001xxxx (MS dual rate capable and asks for "SDCCH"). */ + var DchanTuples chan_cleanup := {}; for (i := 0; i < NUM_SDCCH_PER_BTS; i := i+1) { - f_est_dchan('13'O, NUM_SDCCH_PER_BTS + i, '00010203040506'O); + chan_cleanup := chan_cleanup & { f_est_dchan('13'O, NUM_SDCCH_PER_BTS + i, '00010203040506'O) }; } /* Since only bts 0 is connected, expecting all_allocated to become true for both bts 0 and the "global" bsc @@ -10751,13 +10887,18 @@ /* Also fill up all remaining (TCH) channels */ for (i := 0; i < NUM_TCHF_PER_BTS + NUM_TCHH_PER_BTS; i := i+1) { - f_est_dchan('33'O, NUM_SDCCH_PER_BTS + i, '00010203040506'O); + chan_cleanup := chan_cleanup & { f_est_dchan('33'O, NUM_SDCCH_PER_BTS + i, '00010203040506'O) }; } /* All TCH are now also occupied */ f_all_allocated_expect_counter_change({"all_allocated:sdcch", "all_allocated:static_sdcch", "all_allocated:tch", "all_allocated:static_tch"}); + /* Clean up SDCCH lchans */ + for (i := 0; i < lengthof(chan_cleanup); i := i + 1) { + f_perform_clear_test_ct(chan_cleanup[i]); + } + f_shutdown_helper(); } @@ -10784,8 +10925,9 @@ /* GSM 44.018 Table 9.1.8.2: * RA = '13'O -> Establishment cause = 0001xxxx (MS dual rate capable and asks for "SDCCH"). */ + var DchanTuples chan_cleanup := {}; for (i := 0; i < NUM_SDCCH_PER_BTS; i := i+1) { - f_est_dchan('13'O, NUM_SDCCH_PER_BTS + i, '00010203040506'O); + chan_cleanup := chan_cleanup & { f_est_dchan('13'O, NUM_SDCCH_PER_BTS + i, '00010203040506'O) }; } /* The static SDCCH should now be occupied, while still 3x8 dynamic SDCCH potentially remain. So only @@ -10807,7 +10949,7 @@ /* occupy the remaining TCH, three TCH/F and two TCH/H lchans */ for (i := 0; i < 5; i := i+1) { - f_est_dchan('33'O, NUM_SDCCH_PER_BTS + i, '00010203040506'O); + chan_cleanup := chan_cleanup & { f_est_dchan('33'O, NUM_SDCCH_PER_BTS + i, '00010203040506'O) }; } /* All TCH lchans are now also occupied, both static and dynamic */ @@ -10841,6 +10983,11 @@ /* Now all channels are occupied except the dyn TS, so expecting only the static counters to increment */ f_all_allocated_expect_counter_change({"all_allocated:static_sdcch", "all_allocated:static_tch"}); + /* Clean up SDCCH lchans */ + for (i := 0; i < lengthof(chan_cleanup); i := i + 1) { + f_perform_clear_test_ct(chan_cleanup[i]); + } + /* clean up config */ f_ts_reset_chcomb(0); null-- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26621 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: I9396efcabc085d2850244c6468b83c5f3a3ff3a2 Gerrit-Change-Number: 26621 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-ttcn3-hacks[master]: bsc: detect subscr and conn leaks during f_shutdown_helper()
by neels 23 Jan '22

23 Jan '22

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26619 ) Change subject: bsc: detect subscr and conn leaks during f_shutdown_helper() ...................................................................... bsc: detect subscr and conn leaks during f_shutdown_helper() Invoke f_verify_talloc_count() for bsc_subscr and gsm_subscriber_connection, expecting none to remain after each test. This makes numerous tests fail, where the test does not properly release the RSL and BSSAP connections. An upcoming patch fixes all of those cases: I9396efcabc085d2850244c6468b83c5f3a3ff3a2 Related: OS#5337 Change-Id: I69d4c5c6f8d499bb7f0b96a48af045361433c57b --- M bsc/BSC_Tests.ttcn 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 891d340..d68cba2 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -857,6 +857,11 @@ friend function f_shutdown_helper() runs on test_CT { + /* Run the subscr and conn leak test only when the VTY is initialized */ + if (BSCVTY.checkstate("Mapped")) { + f_verify_talloc_count(BSCVTY, {"struct bsc_subscr", "struct gsm_subscriber_connection"}); + } + all component.stop; setverdict(pass); mtc.stop; null-- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26619 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: I69d4c5c6f8d499bb7f0b96a48af045361433c57b Gerrit-Change-Number: 26619 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

1 0

Change in osmo-ttcn3-hacks[master]: vty: add f_verify_talloc_count()
by neels 23 Jan '22

23 Jan '22

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26618 ) Change subject: vty: add f_verify_talloc_count() ...................................................................... vty: add f_verify_talloc_count() Counts talloc objects via VTY and waits for a specific object count. Useful to test against leaks. The intended use is to check against leakage of bsc_subscr and gsm_subscriber_connection after each BSC_Tests.*, see patch in 'Related' below. Related: OS#5337 Related: I69d4c5c6f8d499bb7f0b96a48af045361433c57b (osmo-ttcn3-hacks) Change-Id: Iafe720a4931270e868f40c4f623d10bb9c14dc80 --- M library/Osmocom_VTY_Functions.ttcn 1 file changed, 64 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified diff --git a/library/Osmocom_VTY_Functions.ttcn b/library/Osmocom_VTY_Functions.ttcn index 49f587d..e4a9182 100644 --- a/library/Osmocom_VTY_Functions.ttcn +++ b/library/Osmocom_VTY_Functions.ttcn @@ -14,6 +14,7 @@ import from Misc_Helpers all; import from TELNETasp_PortType all; import from Osmocom_Types all; + import from TCCConversion_Functions all; modulepar { charstring mp_prompt_prefix := "OpenBSC"; @@ -226,4 +227,67 @@ return ""; } +/* Return a count of how many times sub_str occurs in str. */ +function f_strstr_count(in charstring str, in charstring sub_str) return integer +{ + var integer count := 0; + var integer pos := 0; + + while (true) { + var integer at := f_strstr(str, sub_str, pos); + if (at < 0) { + break; + } + count := count + 1; + pos := at + 1; + } + return count; +} + +private type record of charstring StrList; + +/* Perform a 'show talloc-context' to get a count of the given object_strs that are still allocated. + * Retry 'attempts' times until the actual talloc object count matches 'expect_count'. + * Useful to ensure that no mem leaks remain after running a test. */ +function f_verify_talloc_count(TELNETasp_PT pt, StrList object_strs, integer expect_count := 0, + integer attempts := 5, float wait_time := 3.0) +{ + var charstring show_cmd := "show talloc-context application full filter "; + for (var integer i := 0; i < lengthof(object_strs); i := i + 1) { + var charstring obj_str := object_strs[i]; + /* spaces confuse the VTY command */ + obj_str := f_replaceEveryOccurenceOfSubstring(obj_str, " ", "."); + /* In the regexp, expect word start and word end to bound the obj name */ + obj_str := "\\<" & obj_str & "\\>"; + if (i > 0) { + show_cmd := show_cmd & "\\|"; + } + show_cmd := show_cmd & obj_str; + } + + while (attempts > 0) { + attempts := attempts - 1; + var charstring ret := f_vty_transceive_ret(pt, show_cmd); + + var boolean ok := true; + for (var integer i := 0; i < lengthof(object_strs); i := i + 1) { + var charstring object_str := object_strs[i]; + var integer count := f_strstr_count(ret, object_str); + log("talloc reports ", object_str, " x ", count, ", expecting ", expect_count); + if (count != expect_count) { + ok := false; + } + } + if (ok) { + return; + } + if (attempts == 0) { + break; + } + log("count mismatch, retrying in ", wait_time); + f_sleep(wait_time); + } + setverdict(fail, "talloc count mismatch"); +} + } null-- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26618 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: Iafe720a4931270e868f40c4f623d10bb9c14dc80 Gerrit-Change-Number: 26618 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

2026

2025

2024

2023

2022

gerrit-log