diff options
| author | Harald Welte <laforge@gnumonks.org> | 2019-05-02 19:05:48 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2019-05-02 19:11:14 +0200 |
| commit | 475a2c1d2c6392063b667c00bb461391803f8d3c (patch) | |
| tree | fdd8badb218a75dda8f293a5e5b9677979d43d29 | |
| parent | bc04327e2846c3d4f3e28c3c7180a837d7d9bc63 (diff) | |
move as_iu_release_compl_disc from BSC_ConnHdlr to RAN_Emulation
... this way other tests beyond MSC_Tests.ttcn can use it.
Change-Id: If6d4bbbd09c6261bd665aa66e0d4d027aeaa4d16
| -rw-r--r-- | library/RAN_Emulation.ttcnpp | 23 | ||||
| -rw-r--r-- | msc/BSC_ConnectionHandler.ttcn | 21 |
2 files changed, 23 insertions, 21 deletions
diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp index a74b6de9..d6d74e26 100644 --- a/library/RAN_Emulation.ttcnpp +++ b/library/RAN_Emulation.ttcnpp @@ -1229,5 +1229,28 @@ runs on RAN_ConnHdlr { } } +#ifdef RAN_EMULATION_RANAP +/* expect a IuReleaseCommand; Confirm that; expect SCCP-level N-DISCONNET.ind */ +altstep as_iu_release_compl_disc(float t := 5.0) runs on RAN_ConnHdlr { + var RANAP_PDU ranap; + [] BSSAP.receive(tr_RANAP_IuReleaseCommand(?)) { + BSSAP.send(ts_RANAP_IuReleaseComplete); + alt { + [] BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND) { + setverdict(pass); + } + [] BSSAP.receive { + setverdict(fail, "Unexpected RANAP while waiting for SCCP Release "); + mtc.stop; + } + } + } + [] BSSAP.receive(RANAP_PDU:?) -> value ranap{ + setverdict(fail, "Unexpected RANAP while waiting for IuReleaseCommand", ranap); + mtc.stop; + } +} +#endif + } diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 595f4024..1750bf56 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -1015,27 +1015,6 @@ altstep as_clear_cmd_compl_disc(float t := 5.0) runs on BSC_ConnHdlr { } } -/* expect a IuReleaseCommand; Confirm that; expect SCCP-level N-DISCONNET.ind */ -altstep as_iu_release_compl_disc(float t := 5.0) runs on BSC_ConnHdlr { - var RANAP_PDU ranap; - [] BSSAP.receive(tr_RANAP_IuReleaseCommand(?)) { - BSSAP.send(ts_RANAP_IuReleaseComplete); - alt { - [] BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND) { - setverdict(pass); - } - [] BSSAP.receive { - setverdict(fail, "Unexpected RANAP while waiting for SCCP Release "); - mtc.stop; - } - } - } - [] BSSAP.receive(RANAP_PDU:?) -> value ranap{ - setverdict(fail, "Unexpected RANAP while waiting for IuReleaseCommand", ranap); - mtc.stop; - } -} - function f_expect_clear(float t := 5.0) runs on BSC_ConnHdlr { timer T := t; |