MSC_ConnectionHandler: split up as_media into separate altsteps

as_media() tests both, IPACC/RSL media handling and MGCP media
handling. These two domains are technically quite separate, which
means we can split them up into two separate altsteps in order
to increase readability of the code.

- Split as_media() into as_Media_ipacc() and as_Media_mgw()

Change-Id: I539e8ffdb9f99d5a8e730dd918df502614b9e84d
Related: OS#3292

1 files changed, 17 insertions, 7 deletions

diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn
index 1261a4d9..f38a3e94 100644
--- a/bsc/MSC_ConnectionHandler.ttcn
+++ b/bsc/MSC_ConnectionHandler.ttcn
@@ -149,12 +149,10 @@ private function f_get_mgcp_conn(MgcpConnectionId cid) runs on MSC_ConnHdlr retu
 	self.stop;
 }
 
-
-/* altstep for handling of IPA + MGCP media related commands. Can be activated by a given
- * test case if it expects to see media related handling (i.e. voice calls */
-altstep as_Media() runs on MSC_ConnHdlr {
+/* altstep for handling of IPACC media related commands. Activated by as_Media() to test
+ * RSL level media handling */
+altstep as_Media_ipacc() runs on MSC_ConnHdlr {
 	var RSL_Message rsl;
-	var MgcpCommand mgcp_cmd;
 	var RSL_IE_Body ie;
 	var boolean b_unused;
 	[not g_media.bts.ipa_crcx_seen] RSL.receive(tr_RSL_IPA_CRCX(g_chan_nr)) -> value rsl {
@@ -243,6 +241,14 @@ altstep as_Media() runs on MSC_ConnHdlr {
 		repeat;
 		}
 
+
+}
+
+/* altstep for handling of MGCP media related commands. Activated by as_Media() to test
+ * MGW level media handling */
+altstep as_Media_mgw() runs on MSC_ConnHdlr {
+	var MgcpCommand mgcp_cmd;
+
 	[] MGCP.receive(tr_CRCX) -> value mgcp_cmd {
 		var SDP_Message sdp;
 		var integer cid := f_get_free_mgcp_conn();
@@ -298,8 +304,12 @@ altstep as_Media() runs on MSC_ConnHdlr {
 	}
 }
 
-
-
+/* Altsteps for handling of media related commands. Can be activated by a given
+ * test case if it expects to see media related handling (i.e. voice calls) */
+altstep as_Media() runs on MSC_ConnHdlr {
+	[] as_Media_ipacc();
+	[] as_Media_mgw();
+}
 
 /* this component represents a single subscriber connection at the MSC.
  * There is a 1:1 mapping between SCCP connections and BSSAP_ConnHdlr components.