<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21192">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">handover_test prep: allow configuring several trx in create_bts()<br><br>Preparation for Ic645cea671aa4798804666b8886f11bab5351e11 to allow arbitrary<br>timeslot configurations in the tests.<br><br>Change-Id: Ie0d0c85552ba24802392423b60cfa3919e87563f<br>---<br>M tests/handover/handover_test.c<br>1 file changed, 26 insertions(+), 22 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/92/21192/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c</span><br><span>index 19a8798..fefeb0c 100644</span><br><span>--- a/tests/handover/handover_test.c</span><br><span>+++ b/tests/handover/handover_test.c</span><br><span>@@ -188,12 +188,13 @@</span><br><span> "CCCH+SDCCH4", "TCH/F", "TCH/F", "TCH/F", "TCH/F", "TCH/H", "TCH/H", "NONE",</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct gsm_bts *create_bts(const char * const *ts_args)</span><br><span style="color: hsl(120, 100%, 40%);">+static struct gsm_bts *create_bts(int num_trx, const char * const *ts_args)</span><br><span> {</span><br><span> static int arfcn = 870;</span><br><span> struct gsm_bts *bts;</span><br><span> struct e1inp_sign_link *rsl_link;</span><br><span> int i;</span><br><span style="color: hsl(120, 100%, 40%);">+ int trx_i;</span><br><span> struct gsm_bts_trx *trx;</span><br><span> </span><br><span> bts = bsc_bts_alloc_register(bsc_gsmnet, GSM_BTS_TYPE_UNKNOWN, 0x3f);</span><br><span>@@ -213,29 +214,32 @@</span><br><span> rsl_link->trx = bts->c0;</span><br><span> bts->c0->rsl_link = rsl_link;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- trx = gsm_bts_trx_num(bts, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ for (trx_i = 0; trx_i < num_trx; trx_i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ while (!(trx = gsm_bts_trx_num(bts, trx_i)))</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_bts_trx_alloc(bts);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- trx->mo.nm_state.operational = NM_OPSTATE_ENABLED;</span><br><span style="color: hsl(0, 100%, 40%);">- trx->mo.nm_state.availability = NM_AVSTATE_OK;</span><br><span style="color: hsl(0, 100%, 40%);">- trx->mo.nm_state.administrative = NM_STATE_UNLOCKED;</span><br><span style="color: hsl(0, 100%, 40%);">- trx->bb_transc.mo.nm_state.operational = NM_OPSTATE_ENABLED;</span><br><span style="color: hsl(0, 100%, 40%);">- trx->bb_transc.mo.nm_state.availability = NM_AVSTATE_OK;</span><br><span style="color: hsl(0, 100%, 40%);">- trx->bb_transc.mo.nm_state.administrative = NM_STATE_UNLOCKED;</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->mo.nm_state.operational = NM_OPSTATE_ENABLED;</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->mo.nm_state.availability = NM_AVSTATE_OK;</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->mo.nm_state.administrative = NM_STATE_UNLOCKED;</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->bb_transc.mo.nm_state.operational = NM_OPSTATE_ENABLED;</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->bb_transc.mo.nm_state.availability = NM_AVSTATE_OK;</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->bb_transc.mo.nm_state.administrative = NM_STATE_UNLOCKED;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* 4 full rate and 4 half rate channels */</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < 8; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- trx->ts[i].pchan_from_config = pchan_from_str(ts_args[i]);</span><br><span style="color: hsl(0, 100%, 40%);">- if (trx->ts[i].pchan_from_config == GSM_PCHAN_NONE)</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">- trx->ts[i].mo.nm_state.operational = NM_OPSTATE_ENABLED;</span><br><span style="color: hsl(0, 100%, 40%);">- trx->ts[i].mo.nm_state.availability = NM_AVSTATE_OK;</span><br><span style="color: hsl(0, 100%, 40%);">- trx->ts[i].mo.nm_state.administrative = NM_STATE_UNLOCKED;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* 4 full rate and 4 half rate channels */</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < 8; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->ts[i].pchan_from_config = pchan_from_str(ts_args[trx_i * 8 + i]);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trx->ts[i].pchan_from_config == GSM_PCHAN_NONE)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->ts[i].mo.nm_state.operational = NM_OPSTATE_ENABLED;</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->ts[i].mo.nm_state.availability = NM_AVSTATE_OK;</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->ts[i].mo.nm_state.administrative = NM_STATE_UNLOCKED;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < ARRAY_SIZE(bts->c0->ts); i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* make sure ts->lchans[] get initialized */</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(bts->c0->ts[i].fi, TS_EV_RSL_READY, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(bts->c0->ts[i].fi, TS_EV_OML_READY, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < ARRAY_SIZE(bts->c0->ts); i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* make sure ts->lchans[] get initialized */</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(bts->c0->ts[i].fi, TS_EV_RSL_READY, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(bts->c0->ts[i].fi, TS_EV_OML_READY, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> for (i = 0; i < bsc_gsmnet->num_bts; i++) {</span><br><span>@@ -1524,7 +1528,7 @@</span><br><span> fprintf(stderr, "- Creating %d BTS (one TRX each, "</span><br><span> "TS(1-4) are TCH/F, TS(5-6) are TCH/H)\n", n);</span><br><span> for (i = 0; i < n; i++)</span><br><span style="color: hsl(0, 100%, 40%);">- bts[bts_num + i] = create_bts(bts_default_ts);</span><br><span style="color: hsl(120, 100%, 40%);">+ bts[bts_num + i] = create_bts(1, bts_default_ts);</span><br><span> bts_num += n;</span><br><span> test_case += 2;</span><br><span> } else</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21192">change 21192</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-bsc/+/21192"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ie0d0c85552ba24802392423b60cfa3919e87563f </div>
<div style="display:none"> Gerrit-Change-Number: 21192 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>