Change in osmo-ttcn3-hacks[master]: bsc: expect proper chan_nr for various RSL_MT_RF_CHAN_REL

neels gerrit-no-reply at lists.osmocom.org
Fri Jul 23 02:04:17 UTC 2021


neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25018 )


Change subject: bsc: expect proper chan_nr for various RSL_MT_RF_CHAN_REL
......................................................................

bsc: expect proper chan_nr for various RSL_MT_RF_CHAN_REL

So far we were often just expecting the message type. Instead expect a
release on the proper channel number.

While hunting a test error, this confused me for a while, because a
missing handler resulted in the release message handled in the wrong
place, even though the chan_nr mismatched.

Related: SYS#5130
Change-Id: I002c9273a387104bea062dec8879b4e19a72008d
---
M bsc/BSC_Tests.ttcn
1 file changed, 7 insertions(+), 7 deletions(-)



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

diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 5ab3cc7..4d3acc2 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -4937,12 +4937,12 @@
 	interleave {
 	[] RSL.receive(tr_RSL_DATA_REQ(g_chan_nr, ?, decmatch tr_RRM_RR_RELEASE(int2oct(enum2int(rr_cause), 1)))) {}
 	[] RSL.receive(tr_RSL_DEACT_SACCH(g_chan_nr)) {}
-	[] RSL.receive(tr_RSL_MsgTypeD(RSL_MT_RF_CHAN_REL)) {
+	[] RSL.receive(tr_RSL_RF_CHAN_REL(g_chan_nr)) {
 			RSL.send(ts_RSL_RF_CHAN_REL_ACK(g_chan_nr));
 			f_rslem_unregister(0, g_chan_nr);
 		}
 	[] RSL1.receive(tr_RSL_DEACT_SACCH(new_chan_nr)) {}
-	[] RSL1.receive(tr_RSL_MsgTypeD(RSL_MT_RF_CHAN_REL)) {
+	[] RSL1.receive(tr_RSL_RF_CHAN_REL(new_chan_nr)) {
 			RSL1.send(ts_RSL_RF_CHAN_REL_ACK(new_chan_nr));
 			f_rslem_unregister(0, g_chan_nr, PT := RSL1_PROC);
 		}
@@ -5322,7 +5322,7 @@
 	[] RSL.receive(tr_RSL_DATA_REQ(g_chan_nr, ?, decmatch tr_RRM_RR_RELEASE)) {
 			log("Got RR Release");
 		}
-	[] RSL.receive(tr_RSL_MsgTypeD(RSL_MT_RF_CHAN_REL)) {
+	[] RSL.receive(tr_RSL_RF_CHAN_REL(g_chan_nr)) {
 			log("Got RF Chan Rel");
 			RSL.send(ts_RSL_RF_CHAN_REL_ACK(g_chan_nr));
 			f_rslem_unregister(0, g_chan_nr);
@@ -7121,7 +7121,7 @@
 	[] rsl_pt.receive(tr_RSL_DEACT_SACCH(g_chan_nr)) {
 			f_logp(BSCVTY, "Got RSL Deact SACCH");
 		}
-	[] rsl_pt.receive(tr_RSL_MsgTypeD(RSL_MT_RF_CHAN_REL)) {
+	[] rsl_pt.receive(tr_RSL_RF_CHAN_REL(g_chan_nr)) {
 			f_logp(BSCVTY, "Got RSL RF Chan Rel, sending Rel Ack");
 			rsl_pt.send(ts_RSL_RF_CHAN_REL_ACK(g_chan_nr));
 			f_rslem_unregister(0, g_chan_nr, PT := rsl_proc_pt);
@@ -7147,7 +7147,7 @@
 			/* Also drop the SCCP connection */
 			BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ);
 		}
-	[] rsl_pt.receive(tr_RSL_MsgTypeD(RSL_MT_RF_CHAN_REL)) {
+	[] rsl_pt.receive(tr_RSL_RF_CHAN_REL(g_chan_nr)) {
 			f_logp(BSCVTY, "Got RSL RF Chan Rel, sending Rel Ack");
 			rsl_pt.send(ts_RSL_RF_CHAN_REL_ACK(g_chan_nr));
 			f_rslem_unregister(0, g_chan_nr, PT := rsl_proc_pt);
@@ -9094,7 +9094,7 @@
 	[] RSL.receive(tr_RSL_DEACT_SACCH(g_chan_nr)) {
 			f_logp(BSCVTY, "Got RSL Deact SACCH");
 		}
-	[] RSL.receive(tr_RSL_MsgTypeD(RSL_MT_RF_CHAN_REL)) {
+	[] RSL.receive(tr_RSL_RF_CHAN_REL(g_chan_nr)) {
 			f_logp(BSCVTY, "Got RSL RF Chan Rel, sending Rel Ack");
 			RSL.send(ts_RSL_RF_CHAN_REL_ACK(g_chan_nr));
 			f_rslem_unregister(0, g_chan_nr);
@@ -9272,7 +9272,7 @@
 	[] MGCP.receive(tr_DLCX) {}
 	[] 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_MsgTypeD(RSL_MT_RF_CHAN_REL)) {
+	[] RSL.receive(tr_RSL_RF_CHAN_REL(g_chan_nr)) {
 			RSL.send(ts_RSL_RF_CHAN_REL_ACK(g_chan_nr));
 			f_rslem_unregister(0, g_chan_nr);
 		}

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25018
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: I002c9273a387104bea062dec8879b4e19a72008d
Gerrit-Change-Number: 25018
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/20210723/75afde43/attachment.htm>


More information about the gerrit-log mailing list