<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/14120">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;">MSC_Tests: Remove duplicated structures from BSSMAP_Templates<br><br>Change-Id: Ia82b65fe7e53cc0ab73df94b844b9b85aba9468b<br>---<br>M msc/MSC_Tests.ttcn<br>1 file changed, 0 insertions(+), 138 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn</span><br><span>index f6ab439..b64b872 100644</span><br><span>--- a/msc/MSC_Tests.ttcn</span><br><span>+++ b/msc/MSC_Tests.ttcn</span><br><span>@@ -330,144 +330,6 @@</span><br><span> activate(as_Tguard_direct());</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-template PDU_BSSAP ts_BSSAP_BSSMAP := {</span><br><span style="color: hsl(0, 100%, 40%);">- discriminator := '0'B,</span><br><span style="color: hsl(0, 100%, 40%);">- spare := '0000000'B,</span><br><span style="color: hsl(0, 100%, 40%);">- dlci := omit,</span><br><span style="color: hsl(0, 100%, 40%);">- lengthIndicator := 0, /* overwritten by codec */</span><br><span style="color: hsl(0, 100%, 40%);">- pdu := ?</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-template PDU_BSSAP tr_BSSAP_BSSMAP := {</span><br><span style="color: hsl(0, 100%, 40%);">- discriminator := '0'B,</span><br><span style="color: hsl(0, 100%, 40%);">- spare := '0000000'B,</span><br><span style="color: hsl(0, 100%, 40%);">- dlci := omit,</span><br><span style="color: hsl(0, 100%, 40%);">- lengthIndicator := ?,</span><br><span style="color: hsl(0, 100%, 40%);">- pdu := {</span><br><span style="color: hsl(0, 100%, 40%);">- bssmap := ?</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-type integer BssmapCause;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-template (value) BSSMAP_IE_Cause ts_BSSMAP_IE_Cause(BssmapCause val) := {</span><br><span style="color: hsl(0, 100%, 40%);">- elementIdentifier := '04'O,</span><br><span style="color: hsl(0, 100%, 40%);">- lengthIndicator := 0,</span><br><span style="color: hsl(0, 100%, 40%);">- causeValue := int2bit(val, 7),</span><br><span style="color: hsl(0, 100%, 40%);">- extensionCauseValue := '0'B,</span><br><span style="color: hsl(0, 100%, 40%);">- spare1 := omit</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</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(0, 100%, 40%);">- pdu := {</span><br><span style="color: hsl(0, 100%, 40%);">- bssmap := {</span><br><span style="color: hsl(0, 100%, 40%);">- reset := {</span><br><span style="color: hsl(0, 100%, 40%);">- messageType := '30'O,</span><br><span style="color: hsl(0, 100%, 40%);">- cause := ts_BSSMAP_IE_Cause(cause),</span><br><span style="color: hsl(0, 100%, 40%);">- a_InterfaceSelectorForReset := omit</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</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(0, 100%, 40%);">- pdu := {</span><br><span style="color: hsl(0, 100%, 40%);">- bssmap := {</span><br><span style="color: hsl(0, 100%, 40%);">- resetAck := {</span><br><span style="color: hsl(0, 100%, 40%);">- messageType := '31'O,</span><br><span style="color: hsl(0, 100%, 40%);">- a_InterfaceSelectorForReset := omit</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</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(0, 100%, 40%);">- pdu := {</span><br><span style="color: hsl(0, 100%, 40%);">- bssmap := {</span><br><span style="color: hsl(0, 100%, 40%);">- resetAck := {</span><br><span style="color: hsl(0, 100%, 40%);">- messageType := '31'O,</span><br><span style="color: hsl(0, 100%, 40%);">- a_InterfaceSelectorForReset := *</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-template BSSMAP_IE_CellIdentifier ts_BSSMAP_IE_CellID := {</span><br><span style="color: hsl(0, 100%, 40%);">- elementIdentifier := '05'O,</span><br><span style="color: hsl(0, 100%, 40%);">- lengthIndicator := 0,</span><br><span style="color: hsl(0, 100%, 40%);">- cellIdentifierDiscriminator := '0000'B,</span><br><span style="color: hsl(0, 100%, 40%);">- spare1_4 := '0000'B,</span><br><span style="color: hsl(0, 100%, 40%);">- cellIdentification := ?</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-type uint16_t BssmapLAC;</span><br><span style="color: hsl(0, 100%, 40%);">-type uint16_t BssmapCI;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/*</span><br><span style="color: hsl(0, 100%, 40%);">-template BSSMAP_IE_CellIdentifier ts_CellId_CGI(mcc, mnc, lac, ci)</span><br><span style="color: hsl(0, 100%, 40%);">-modifies ts_BSSMAP_IE_CellID := {</span><br><span style="color: hsl(0, 100%, 40%);">- cellIdentification := {</span><br><span style="color: hsl(0, 100%, 40%);">- cI_LAC_CGI := {</span><br><span style="color: hsl(0, 100%, 40%);">- mnc_mcc := FIXME,</span><br><span style="color: hsl(0, 100%, 40%);">- lac := int2oct(lac, 2),</span><br><span style="color: hsl(0, 100%, 40%);">- ci := int2oct(ci, 2)</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-*/</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-template BSSMAP_IE_CellIdentifier ts_CellID_LAC_CI(BssmapLAC lac, BssmapCI ci)</span><br><span style="color: hsl(0, 100%, 40%);">-modifies ts_BSSMAP_IE_CellID := {</span><br><span style="color: hsl(0, 100%, 40%);">- cellIdentification := {</span><br><span style="color: hsl(0, 100%, 40%);">- cI_LAC_CI := {</span><br><span style="color: hsl(0, 100%, 40%);">- lac := int2oct(lac, 2),</span><br><span style="color: hsl(0, 100%, 40%);">- ci := int2oct(ci, 2)</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-template BSSMAP_IE_CellIdentifier ts_CellId_CI(BssmapCI ci)</span><br><span style="color: hsl(0, 100%, 40%);">-modifies ts_BSSMAP_IE_CellID := {</span><br><span style="color: hsl(0, 100%, 40%);">- cellIdentification := {</span><br><span style="color: hsl(0, 100%, 40%);">- cI_CI := int2oct(ci, 2)</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-template BSSMAP_IE_CellIdentifier ts_CellId_none</span><br><span style="color: hsl(0, 100%, 40%);">-modifies ts_BSSMAP_IE_CellID := {</span><br><span style="color: hsl(0, 100%, 40%);">- cellIdentification := {</span><br><span style="color: hsl(0, 100%, 40%);">- cI_noCell := ''O</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-template BSSMAP_IE_Layer3Information ts_BSSMAP_IE_L3Info(octetstring l3info) := {</span><br><span style="color: hsl(0, 100%, 40%);">- elementIdentifier := '17'O,</span><br><span style="color: hsl(0, 100%, 40%);">- lengthIndicator := 0,</span><br><span style="color: hsl(0, 100%, 40%);">- layer3info := l3info</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-template PDU_BSSAP ts_BSSMAP_ComplL3(BSSMAP_IE_CellIdentifier cell_id, octetstring l3_info)</span><br><span style="color: hsl(0, 100%, 40%);">-modifies ts_BSSAP_BSSMAP := {</span><br><span style="color: hsl(0, 100%, 40%);">- pdu := {</span><br><span style="color: hsl(0, 100%, 40%);">- bssmap := {</span><br><span style="color: hsl(0, 100%, 40%);">- completeLayer3Information := {</span><br><span style="color: hsl(0, 100%, 40%);">- messageType := '57'O,</span><br><span style="color: hsl(0, 100%, 40%);">- cellIdentifier := cell_id,</span><br><span style="color: hsl(0, 100%, 40%);">- layer3Information := ts_BSSMAP_IE_L3Info(l3_info),</span><br><span style="color: hsl(0, 100%, 40%);">- chosenChannel := omit,</span><br><span style="color: hsl(0, 100%, 40%);">- lSAIdentifier := omit,</span><br><span style="color: hsl(0, 100%, 40%);">- aPDU := omit,</span><br><span style="color: hsl(0, 100%, 40%);">- codecList := omit,</span><br><span style="color: hsl(0, 100%, 40%);">- redirectAttemptFlag := omit,</span><br><span style="color: hsl(0, 100%, 40%);">- sendSequenceNumber := omit,</span><br><span style="color: hsl(0, 100%, 40%);">- iMSI := omit</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> type function void_fn(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr;</span><br><span> </span><br><span> /* FIXME: move into BSC_ConnectionHandler? */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14120">change 14120</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/14120"/><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: Ia82b65fe7e53cc0ab73df94b844b9b85aba9468b </div>
<div style="display:none"> Gerrit-Change-Number: 14120 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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>