[MERGED] osmo-ttcn3-hacks[master]: RSL: Make ts_RSL_IPA_DLCX require a conn_id value

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: RSL: Make ts_RSL_IPA_DLCX require a conn_id value
......................................................................


RSL: Make ts_RSL_IPA_DLCX require a conn_id value

The way how TTCN-3 templates work it's not possible for us to have
a parametric template for both generating DLCX with conn_id and without :(

Change-Id: Icb772ca5b9661ab39b1c161fa4ebc70544275d8f
---
M bts/BTS_Tests.ttcn
M library/RSL_Types.ttcn
2 files changed, 4 insertions(+), 5 deletions(-)

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



diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 92fde03..00143bf 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -1002,7 +1002,7 @@
 /* Send IPA DLCX to inactive lchan */
 function f_TC_ipa_dlcx_not_active(charstring id) runs on ConnHdlr {
 	timer T := 3.0;
-	RSL.send(ts_RSL_IPA_DLCX(g_chan_nr));
+	RSL.send(ts_RSL_IPA_DLCX(g_chan_nr, 0));
 	T.start;
 	alt {
 	[] RSL.receive(tr_RSL_IPA_DLCX_ACK(g_chan_nr, ?, ?)) {
diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn
index 336b042..1d68969 100644
--- a/library/RSL_Types.ttcn
+++ b/library/RSL_Types.ttcn
@@ -1453,13 +1453,12 @@
 		}
 	}
 
-	template RSL_Message ts_RSL_IPA_DLCX(RslChannelNr chan_nr,
-					     template (omit) uint16_t ipa_conn_id := omit) := {
+	template RSL_Message ts_RSL_IPA_DLCX(RslChannelNr chan_nr, uint16_t ipa_conn_id) := {
 		msg_disc := ts_RSL_MsgDisc(RSL_MDISC_IPACCESS, false),
 		msg_type := RSL_MT_IPAC_DLCX,
 		ies := {
-			t_RSL_IE(RSL_IE_CHAN_NR, RSL_IE_Body:{chan_nr := chan_nr})
-			/* FIXME: optional conn_id */
+			t_RSL_IE(RSL_IE_CHAN_NR, RSL_IE_Body:{chan_nr := chan_nr}),
+			t_RSL_IE(RSL_IE_IPAC_CONN_ID, RSL_IE_Body:{ipa_conn_id := ipa_conn_id})
 		}
 	}
 	template RSL_Message tr_RSL_IPA_DLCX(template RslChannelNr chan_nr,

-- 
To view, visit https://gerrit.osmocom.org/6894
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icb772ca5b9661ab39b1c161fa4ebc70544275d8f
Gerrit-PatchSet: 2
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder