fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36470?usp=email )
Change subject: msc: fix as_clear_cmd_compl_disc(): make it Iu-compatible
......................................................................
msc: fix as_clear_cmd_compl_disc(): make it Iu-compatible
Previous commit [1] uncovers a problem in as_clear_cmd_compl_disc():
this altstep is expecting BSSMAP Clear Command, which is specific
to the A-interface (GERAN). In TC_iu_mt_crcx_ran_reject though,
we receive RANAP Iu-ReleaseCommand, which is specific to the Iu-
interface (UTRAN), but not handled in this altstep.
The testcase was passing so far due to a bug in as_optional_cc_rel(),
which would unblock the alt-statemtnt on receipt of CC RELEASE, so
that we would never respond to RANAP Iu-ReleaseCommand.
Modify it to handle RANAP Iu-ReleaseCommand in addition to the
BSSMAP Clear Command. Take a change to remove the np-op argument.
Change-Id: Idd679bbf720a56a76cf37ab414b1e6d90e53278b
Related: [1] I0143b4d33b1ebe4cce99c09018540524c4626eec
---
M msc/BSC_ConnectionHandler.ttcn
1 file changed, 32 insertions(+), 10 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/70/36470/1
diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn
index b3d915c..d10e2af 100644
--- a/msc/BSC_ConnectionHandler.ttcn
+++ b/msc/BSC_ConnectionHandler.ttcn
@@ -1967,19 +1967,18 @@
}
/* expect a clear command */
-altstep as_clear_cmd_compl_disc(float t := 5.0) runs on BSC_ConnHdlr {
+altstep as_clear_cmd_compl_disc() runs on BSC_ConnHdlr {
var PDU_BSSAP bssap;
- [] BSSAP.receive(tr_BSSMAP_ClearCommand) {
+
+ [g_pars.ran_is_geran] BSSAP.receive(tr_BSSMAP_ClearCommand) {
BSSAP.send(ts_BSSMAP_ClearComplete);
- alt {
- [] BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND) {
- setverdict(pass);
- }
- [] BSSAP.receive {
- setverdict(fail, "Unexpected BSSMAP while waiting for
SCCP Release");
- mtc.stop;
- }
+ BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND);
+ setverdict(pass);
}
+ [not g_pars.ran_is_geran] BSSAP.receive(tr_RANAP_IuReleaseCommand(?)) {
+ BSSAP.send(ts_RANAP_IuReleaseComplete);
+ BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND);
+ setverdict(pass);
}
[] BSSAP.receive(tr_BSSAP_BSSMAP) -> value bssap {
setverdict(fail, "Unexpected BSSMAP while waiting for
ClearCommand", bssap);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36470?usp=email
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: Idd679bbf720a56a76cf37ab414b1e6d90e53278b
Gerrit-Change-Number: 36470
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanits...@sysmocom.de>
Gerrit-MessageType: newchange
