Change in osmo-ttcn3-hacks[master]: bsc: f_perform_clear: ack all DLCX and RSL REL REQ

[neels]

neels has uploaded this change for review. ( 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(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/20/26620/1

diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index b1e9875..c9c9103 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -7780,9 +7780,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_if_vty_inited("MSC instructs BSC to clear channel");
 	BSSAP.send(ts_BSSMAP_ClearCommand(0));
 	interleave {
@@ -7803,6 +7821,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,

-- 
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: 1
Gerrit-Owner: neels <nhofmeyr at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20211217/351a1a09/attachment.htm>