<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19114">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">library/GSM_RestOctets: add SI2quater EUTRAN templates<br><br>Will be used in upcoming System Information tests.<br><br>Change-Id: I4162cc39ad351f5e96f5941116a424adc44efaa2<br>---<br>M library/GSM_RestOctets.ttcn<br>1 file changed, 133 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/GSM_RestOctets.ttcn b/library/GSM_RestOctets.ttcn</span><br><span>index 39f15bb..2b43751 100644</span><br><span>--- a/library/GSM_RestOctets.ttcn</span><br><span>+++ b/library/GSM_RestOctets.ttcn</span><br><span>@@ -378,7 +378,7 @@</span><br><span> </span><br><span> /* Repeated E-UTRAN Neighbour Cells */</span><br><span> private type record of EUTRAN_NeighbourCells EUTRAN_RepeatedNeighbourCells;</span><br><span style="color: hsl(0, 100%, 40%);">-private type record EUTRAN_NeighbourCells {</span><br><span style="color: hsl(120, 100%, 40%);">+type record EUTRAN_NeighbourCells {</span><br><span> BIT1 item_ind ('1'B),</span><br><span> /* { 1 < Repeated E-UTRAN Neighbour Cells > } ** 0 */</span><br><span> EUTRAN_CellDescs cell_desc_list optional,</span><br><span>@@ -398,8 +398,8 @@</span><br><span> };</span><br><span> </span><br><span> /* Repeated E-UTRAN Cell Description (E-ARFCN & Measurement Bandwidth) List */</span><br><span style="color: hsl(0, 100%, 40%);">-private type record of EUTRAN_CellDesc EUTRAN_CellDescs;</span><br><span style="color: hsl(0, 100%, 40%);">-private type record EUTRAN_CellDesc {</span><br><span style="color: hsl(120, 100%, 40%);">+type record of EUTRAN_CellDesc EUTRAN_CellDescs;</span><br><span style="color: hsl(120, 100%, 40%);">+type record EUTRAN_CellDesc {</span><br><span> BIT1 item_ind ('1'B),</span><br><span> uint16_t e_arfcn,</span><br><span> BIT1 meas_bw_presence, // 0/1</span><br><span>@@ -513,6 +513,136 @@</span><br><span> rel_additions := { rel5_presence := CSN1_L, rel5 := omit }</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+template SI2quaterRestOctets tro_SI2quaterRestOctets_rel8_EUTRAN</span><br><span style="color: hsl(120, 100%, 40%);">+modifies tro_SI2quaterRestOctets_base</span><br><span style="color: hsl(120, 100%, 40%);">+:= {</span><br><span style="color: hsl(120, 100%, 40%);">+ ba_ind := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ ba_3g_ind := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ mp_change_mark := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ si2quater_index := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ si2quater_count := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rel_additions := {</span><br><span style="color: hsl(120, 100%, 40%);">+ rel5_presence := CSN1_H,</span><br><span style="color: hsl(120, 100%, 40%);">+ rel5 := {</span><br><span style="color: hsl(120, 100%, 40%);">+ umts_add_meas_params_desc := { presence := '0'B, desc := omit },</span><br><span style="color: hsl(120, 100%, 40%);">+ umts_add_meas_params_desc2 := { presence := '0'B, desc := omit },</span><br><span style="color: hsl(120, 100%, 40%);">+ rel6_presence := CSN1_H,</span><br><span style="color: hsl(120, 100%, 40%);">+ rel6 := {</span><br><span style="color: hsl(120, 100%, 40%);">+ umts_ccn_active := '0'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ rel7_presence := CSN1_H,</span><br><span style="color: hsl(120, 100%, 40%);">+ rel7 := {</span><br><span style="color: hsl(120, 100%, 40%);">+ rep700 := { presence := '0'B, val := omit },</span><br><span style="color: hsl(120, 100%, 40%);">+ rep810 := { presence := '0'B, val := omit },</span><br><span style="color: hsl(120, 100%, 40%);">+ rel8_presence := CSN1_H,</span><br><span style="color: hsl(120, 100%, 40%);">+ rel8 := {</span><br><span style="color: hsl(120, 100%, 40%);">+ prio_eutran_params_desc := {</span><br><span style="color: hsl(120, 100%, 40%);">+ presence := '1'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ desc := {</span><br><span style="color: hsl(120, 100%, 40%);">+ sc_prio_params_desc := { presence := '0'B, desc := omit },</span><br><span style="color: hsl(120, 100%, 40%);">+ utran_prio_params_desc := { presence := '0'B, desc := omit },</span><br><span style="color: hsl(120, 100%, 40%);">+ eutran_params_desc := {</span><br><span style="color: hsl(120, 100%, 40%);">+ presence := '1'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ desc := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ccn_active := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ e_start := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ e_stop := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ meas_params_desc := { presence := '0'B, desc := omit },</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_meas_params_desc := { presence := '0'B, desc := omit },</span><br><span style="color: hsl(120, 100%, 40%);">+ repeated_neigh_cells := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ repeated_neigh_cells_term := '0'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ repeated_not_allowed_cells := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+ repeated_not_allowed_cells_term := '0'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ pcid2ta_map_list := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+ pcid2ta_map_list_term := '0'B</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%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ utran_csg_desc := { presence := '0'B, desc := omit },</span><br><span style="color: hsl(120, 100%, 40%);">+ eutran_csg_desc := { presence := '0'B, desc := 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%);">+ }</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%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+template EUTRAN_CellDesc tr_EUTRAN_CellDesc(template (present) uint16_t e_arfcn := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (present) BIT1 meas_bw_presence := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ template uint3_t meas_bw := *)</span><br><span style="color: hsl(120, 100%, 40%);">+:= {</span><br><span style="color: hsl(120, 100%, 40%);">+ item_ind := '1'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ e_arfcn := e_arfcn,</span><br><span style="color: hsl(120, 100%, 40%);">+ meas_bw_presence := meas_bw_presence,</span><br><span style="color: hsl(120, 100%, 40%);">+ meas_bw := meas_bw</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%);">+/* Defaults correspond to osmo-bsc cfg:</span><br><span style="color: hsl(120, 100%, 40%);">+ * si2quater neighbor-list add earfcn 111 thresh-hi 20 thresh-lo 10 prio 3 qrxlv 22 meas 3</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+template EUTRAN_NeighbourCells tr_EUTRAN_NeighbourCells(template (present) EUTRAN_CellDescs cell_desc_list := { tr_EUTRAN_CellDesc },</span><br><span style="color: hsl(120, 100%, 40%);">+ template (present) BIT1 prio_presence := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ template uint3_t prio := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (present) uint5_t thresh_high := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (present) BIT1 thresh_low_presence := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ template uint5_t thresh_low := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (present) BIT1 qrxlevmin_presence := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ template uint5_t qrxlevmin := *)</span><br><span style="color: hsl(120, 100%, 40%);">+:= {</span><br><span style="color: hsl(120, 100%, 40%);">+ item_ind := '1'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ cell_desc_list := cell_desc_list,</span><br><span style="color: hsl(120, 100%, 40%);">+ cell_desc_list_term := '0'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ prio_presence := prio_presence,</span><br><span style="color: hsl(120, 100%, 40%);">+ prio := prio,</span><br><span style="color: hsl(120, 100%, 40%);">+ thresh_high := thresh_high,</span><br><span style="color: hsl(120, 100%, 40%);">+ thresh_low_presence := thresh_low_presence,</span><br><span style="color: hsl(120, 100%, 40%);">+ thresh_low := thresh_low,</span><br><span style="color: hsl(120, 100%, 40%);">+ qrxlevmin_presence := qrxlevmin_presence,</span><br><span style="color: hsl(120, 100%, 40%);">+ qrxlevmin := qrxlevmin</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 SI2quaterRestOctets tr_SI2quaterRestOctets_EUTRAN(</span><br><span style="color: hsl(120, 100%, 40%);">+ template integer index := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ template integer count := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ template EUTRAN_RepeatedNeighbourCells repeated_neigh_cells := { tr_EUTRAN_NeighbourCells }</span><br><span style="color: hsl(120, 100%, 40%);">+) modifies tro_SI2quaterRestOctets_rel8_EUTRAN := {</span><br><span style="color: hsl(120, 100%, 40%);">+ si2quater_index := index,</span><br><span style="color: hsl(120, 100%, 40%);">+ si2quater_count := count,</span><br><span style="color: hsl(120, 100%, 40%);">+ rel_additions := {</span><br><span style="color: hsl(120, 100%, 40%);">+ rel5 := {</span><br><span style="color: hsl(120, 100%, 40%);">+ rel6 := {</span><br><span style="color: hsl(120, 100%, 40%);">+ rel7 := {</span><br><span style="color: hsl(120, 100%, 40%);">+ rel8 := {</span><br><span style="color: hsl(120, 100%, 40%);">+ prio_eutran_params_desc := {</span><br><span style="color: hsl(120, 100%, 40%);">+ desc := {</span><br><span style="color: hsl(120, 100%, 40%);">+ sc_prio_params_desc := {</span><br><span style="color: hsl(120, 100%, 40%);">+ presence := '1'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ desc := {</span><br><span style="color: hsl(120, 100%, 40%);">+ geran_priority := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ thresh_priority_search := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ thresh_gsm_low := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ h_prio := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ t_reselection := 0</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%);">+ eutran_params_desc := {</span><br><span style="color: hsl(120, 100%, 40%);">+ desc := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ccn_active := '0'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ e_start := '1'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ e_stop := '1'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ repeated_neigh_cells := repeated_neigh_cells</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%);">+ }</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%);">+ }</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%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> /* 10.5.2.34 SI 3 Rest Octets */</span><br><span> type record SI3RestOctets {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19114">change 19114</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/c/osmo-ttcn3-hacks/+/19114"/><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-Change-Id: I4162cc39ad351f5e96f5941116a424adc44efaa2 </div>
<div style="display:none"> Gerrit-Change-Number: 19114 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>