Change in osmo-ttcn3-hacks[master]: bsc: Don't expect BSC to release SCCP in LCLS.TC_lcls_connect_clear()

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9539 )

Change subject: bsc: Don't expect BSC to release SCCP in LCLS.TC_lcls_connect_clear()
......................................................................

bsc: Don't expect BSC to release SCCP in LCLS.TC_lcls_connect_clear()

While osmo-bsc was still affected of OS#3331, it would release the SCCP
connection from the BSC side.  This is illegal as per 3GPP spec and
has meanwhile been fixed in osmo-bsc master.  However, the testcase
BSC_Tests_LCLS.TC_lcls_connect_clear() relied on the broken behavior,
let's fix that.

The testcase now releases the SCCP connection from the simulated MSC
side in response to the BSSMAP Clear Complete from the BSC.

Change-Id: Ic3e1f8729a093b04941ec7ca72664d53adb21229
---
M bsc/BSC_Tests_LCLS.ttcn
1 file changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/bsc/BSC_Tests_LCLS.ttcn b/bsc/BSC_Tests_LCLS.ttcn
index fd37b4b..b99ba58 100644
--- a/bsc/BSC_Tests_LCLS.ttcn
+++ b/bsc/BSC_Tests_LCLS.ttcn
@@ -116,6 +116,7 @@
 	[] RSL.receive(RSL_Message:?) -> value rsl_msg { MASTER.send(rsl_msg); }
 	/* from master process to ConnHdlr */
 	[] MASTER.receive(PDU_BSSAP:?) -> value bssap { BSSAP.send(bssap); }
+	[] MASTER.receive(BSSAP_Conn_Prim:?) -> value bssap_p { BSSAP.send(bssap_p); }
 	[] MASTER.receive(PDU_DTAP_MO:?) -> value dtap_mo { BSSAP.send(dtap_mo); }
 	[] MASTER.receive(PDU_DTAP_MT:?) -> value dtap_mt { BSSAP.send(dtap_mt); }
 	[] MASTER.receive(MgcpCommand:?) -> value mgcp_cmd { MGCP.send(mgcp_cmd); }
@@ -553,8 +554,9 @@
 		f_rsl_find_ie(rsl, RSL_IE_CHAN_NR, ieb);
 		CONN_A.send(ts_RSL_RF_CHAN_REL_ACK(ieb.chan_nr));
 		}
-	[] CONN_A.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_DISC_IND);
-	[] CONN_A.receive(tr_BSSMAP_ClearComplete);
+	[] CONN_A.receive(tr_BSSMAP_ClearComplete) {
+		CONN_A.send(BSSAP_Conn_Prim:MSC_CONN_PRIM_DISC_REQ);
+		}
 	[] CONN_B.receive(tr_BSSMAP_LclsNotificationSts(LCLS_STS_not_possible_ls));
 	}
 	f_sleep(2.0);

-- 
To view, visit https://gerrit.osmocom.org/9539
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic3e1f8729a093b04941ec7ca72664d53adb21229
Gerrit-Change-Number: 9539
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180611/b86e4a38/attachment.htm>