<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/14141">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BSSMAP_templates: Update templates to set Osmux fields<br><br>After new fields (osmux osmocom extensions) were added to BSSMAP Reset<br>and BSSMAP AssignReq/AssignCompl in titan.ProtocolModules.BSSMAP, we<br>need to set them in ts_* templates, otherwise TTCN3 runtimes fails with:<br>"""<br>BSC_Tests.ttcn:143 Dynamic test case error: Performing a valueof or send<br>operation on a non-specific template of type @BSSAP_Types.BSSMAP_IE_Osmo_OsmuxSupport.<br>"""<br><br>Fixes: fe0c6083bd7176b8375fafc6d6399772d85a70a3<br>Depends: titan.ProtocolModules.BSSMAP Iaf1e137269c0da20b2c96fd104b57edf336693af<br>Change-Id: I568100376cf8a47c01a33bada97bf8eaa7c07fcd<br>---<br>M library/BSSMAP_Templates.ttcn<br>1 file changed, 44 insertions(+), 16 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn</span><br><span>index 02c84e2..ad314a3 100644</span><br><span>--- a/library/BSSMAP_Templates.ttcn</span><br><span>+++ b/library/BSSMAP_Templates.ttcn</span><br><span>@@ -164,47 +164,62 @@</span><br><span> oldToNewBSSIEs := val</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-template (value) PDU_BSSAP ts_BSSMAP_Reset(BssmapCause cause) modifies ts_BSSAP_BSSMAP := {</span><br><span style="color: hsl(120, 100%, 40%);">+template BSSMAP_IE_Osmo_OsmuxSupport tr_BSSMAP_IE_Osmo_OsmuxSupport := {</span><br><span style="color: hsl(120, 100%, 40%);">+ elementIdentifier := 'F0'O</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_enc_osmux_support(boolean osmux_enabled) return template BSSMAP_IE_Osmo_OsmuxSupport {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmux_enabled) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return tr_BSSMAP_IE_Osmo_OsmuxSupport;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return omit;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+template (value) PDU_BSSAP ts_BSSMAP_Reset(BssmapCause cause, boolean osmux_enabled := false) modifies ts_BSSAP_BSSMAP := {</span><br><span> pdu := {</span><br><span> bssmap := {</span><br><span> reset := {</span><br><span> messageType := '30'O,</span><br><span> cause := ts_BSSMAP_IE_Cause(cause),</span><br><span style="color: hsl(0, 100%, 40%);">- a_InterfaceSelectorForReset := omit</span><br><span style="color: hsl(120, 100%, 40%);">+ a_InterfaceSelectorForReset := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+ osmuxSupport := f_enc_osmux_support(osmux_enabled)</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-template PDU_BSSAP tr_BSSMAP_Reset modifies tr_BSSAP_BSSMAP := {</span><br><span style="color: hsl(120, 100%, 40%);">+template PDU_BSSAP tr_BSSMAP_Reset(boolean osmux_enabled := false) modifies tr_BSSAP_BSSMAP := {</span><br><span> pdu := {</span><br><span> bssmap := {</span><br><span> reset := {</span><br><span> messageType := '30'O,</span><br><span> cause := ?,</span><br><span style="color: hsl(0, 100%, 40%);">- a_InterfaceSelectorForReset := *</span><br><span style="color: hsl(120, 100%, 40%);">+ a_InterfaceSelectorForReset := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ osmuxSupport := f_enc_osmux_support(osmux_enabled)</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-template (value) PDU_BSSAP ts_BSSMAP_ResetAck modifies ts_BSSAP_BSSMAP := {</span><br><span style="color: hsl(120, 100%, 40%);">+template (value) PDU_BSSAP ts_BSSMAP_ResetAck(boolean osmux_enabled := false) modifies ts_BSSAP_BSSMAP := {</span><br><span> pdu := {</span><br><span> bssmap := {</span><br><span> resetAck := {</span><br><span> messageType := '31'O,</span><br><span style="color: hsl(0, 100%, 40%);">- a_InterfaceSelectorForReset := omit</span><br><span style="color: hsl(120, 100%, 40%);">+ a_InterfaceSelectorForReset := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+ osmuxSupport := f_enc_osmux_support(osmux_enabled)</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-template PDU_BSSAP tr_BSSMAP_ResetAck modifies tr_BSSAP_BSSMAP := {</span><br><span style="color: hsl(120, 100%, 40%);">+template PDU_BSSAP tr_BSSMAP_ResetAck(boolean osmux_enabled := false) modifies tr_BSSAP_BSSMAP := {</span><br><span> pdu := {</span><br><span> bssmap := {</span><br><span> resetAck := {</span><br><span> messageType := '31'O,</span><br><span style="color: hsl(0, 100%, 40%);">- a_InterfaceSelectorForReset := *</span><br><span style="color: hsl(120, 100%, 40%);">+ a_InterfaceSelectorForReset := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ osmuxSupport := f_enc_osmux_support(osmux_enabled)</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span>@@ -443,9 +458,15 @@</span><br><span> codecElements := valueof(elem)</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+template (value) BSSMAP_IE_Osmo_OsmuxCID ts_OsmuxCID(INT1 cid) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ elementIdentifier := 'F1'O,</span><br><span style="color: hsl(120, 100%, 40%);">+ osmuxCID := cid</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> template PDU_BSSAP</span><br><span> ts_BSSMAP_AssignmentReq(template BSSMAP_IE_CircuitIdentityCode cic := omit,</span><br><span style="color: hsl(0, 100%, 40%);">- template BSSMAP_IE_AoIP_TransportLayerAddress aoip := omit)</span><br><span style="color: hsl(120, 100%, 40%);">+ template BSSMAP_IE_AoIP_TransportLayerAddress aoip := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+ template BSSMAP_IE_Osmo_OsmuxCID osmuxCID := omit)</span><br><span> modifies ts_BSSAP_BSSMAP := {</span><br><span> pdu := {</span><br><span> bssmap := {</span><br><span>@@ -472,14 +493,16 @@</span><br><span> globalCallReference := omit,</span><br><span> lCLS_Configuration := omit,</span><br><span> lCLS_ConnectionStatusControl := omit,</span><br><span style="color: hsl(0, 100%, 40%);">- lCLS_CorrelationNotNeeded := omit</span><br><span style="color: hsl(120, 100%, 40%);">+ lCLS_CorrelationNotNeeded := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+ osmuxCID := osmuxCID</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span> </span><br><span> template PDU_BSSAP tr_BSSMAP_AssignmentReq(template BSSMAP_IE_CircuitIdentityCode cic := *,</span><br><span style="color: hsl(0, 100%, 40%);">- template BSSMAP_IE_AoIP_TransportLayerAddress aoip := *)</span><br><span style="color: hsl(120, 100%, 40%);">+ template BSSMAP_IE_AoIP_TransportLayerAddress aoip := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ template BSSMAP_IE_Osmo_OsmuxCID osmuxCID := *)</span><br><span> modifies tr_BSSAP_BSSMAP := {</span><br><span> pdu := {</span><br><span> bssmap := {</span><br><span>@@ -506,7 +529,8 @@</span><br><span> globalCallReference := *,</span><br><span> lCLS_Configuration := *,</span><br><span> lCLS_ConnectionStatusControl := *,</span><br><span style="color: hsl(0, 100%, 40%);">- lCLS_CorrelationNotNeeded := *</span><br><span style="color: hsl(120, 100%, 40%);">+ lCLS_CorrelationNotNeeded := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ osmuxCID := osmuxCID</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span>@@ -515,7 +539,8 @@</span><br><span> template PDU_BSSAP</span><br><span> ts_BSSMAP_AssignmentComplete(template BSSMAP_IE_CircuitIdentityCode cic := omit,</span><br><span> template BSSMAP_IE_AoIP_TransportLayerAddress aoip := omit,</span><br><span style="color: hsl(0, 100%, 40%);">- template BSSMAP_IE_SpeechCodec speechCodec := omit)</span><br><span style="color: hsl(120, 100%, 40%);">+ template BSSMAP_IE_SpeechCodec speechCodec := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+ template BSSMAP_IE_Osmo_OsmuxCID osmuxCID := omit)</span><br><span> modifies ts_BSSAP_BSSMAP := {</span><br><span> pdu := {</span><br><span> bssmap := {</span><br><span>@@ -533,14 +558,16 @@</span><br><span> aoIPTransportLayer := aoip,</span><br><span> speechCodec := speechCodec,</span><br><span> codecList := omit,</span><br><span style="color: hsl(0, 100%, 40%);">- lCLS_BSS_Status := omit</span><br><span style="color: hsl(120, 100%, 40%);">+ lCLS_BSS_Status := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+ osmuxCID := osmuxCID</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span> </span><br><span> template PDU_BSSAP tr_BSSMAP_AssignmentComplete(template BSSMAP_IE_CircuitIdentityCode cic := *,</span><br><span style="color: hsl(0, 100%, 40%);">- template BSSMAP_IE_AoIP_TransportLayerAddress aoip := *)</span><br><span style="color: hsl(120, 100%, 40%);">+ template BSSMAP_IE_AoIP_TransportLayerAddress aoip := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ template BSSMAP_IE_Osmo_OsmuxCID osmuxCID := *)</span><br><span> modifies tr_BSSAP_BSSMAP := {</span><br><span> pdu := {</span><br><span> bssmap := {</span><br><span>@@ -558,7 +585,8 @@</span><br><span> aoIPTransportLayer := aoip,</span><br><span> speechCodec := *,</span><br><span> codecList := *,</span><br><span style="color: hsl(0, 100%, 40%);">- lCLS_BSS_Status := *</span><br><span style="color: hsl(120, 100%, 40%);">+ lCLS_BSS_Status := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ osmuxCID := osmuxCID</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14141">change 14141</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/14141"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I568100376cf8a47c01a33bada97bf8eaa7c07fcd </div>
<div style="display:none"> Gerrit-Change-Number: 14141 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>