<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21198">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">handover_test: add 'set-ts-use'<br><br>When a test wants to use N lchans, so far it has to issue N 'create-ms'<br>commands. Many lchan distributions cannot be easily obtained by this, because<br>'crate-ms' always takes the first free lchan. To shorten test setup and easily<br>allow arbitrary lchan distributions, this command sets specific lchans to<br>specific usage states in one line.<br><br>Change-Id: I6e90679bf22609fb72e53e3d11748a4070a38159<br>---<br>M tests/handover/handover_test.c<br>1 file changed, 118 insertions(+), 10 deletions(-)<br><br></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 0abe41d..5655bda 100644</span><br><span>--- a/tests/handover/handover_test.c</span><br><span>+++ b/tests/handover/handover_test.c</span><br><span>@@ -372,20 +372,12 @@</span><br><span> osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_A_CONN_CFM, NULL);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* create lchan */</span><br><span style="color: hsl(0, 100%, 40%);">-struct gsm_lchan *create_lchan(struct gsm_bts *bts, int full_rate, char *codec)</span><br><span style="color: hsl(120, 100%, 40%);">+struct gsm_lchan *lchan_act(struct gsm_lchan *lchan, int full_rate, const char *codec)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_lchan *lchan;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- lchan = lchan_select_by_type(bts, (full_rate) ? GSM_LCHAN_TCH_F : GSM_LCHAN_TCH_H);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!lchan) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("No resource for lchan\n");</span><br><span style="color: hsl(0, 100%, 40%);">- exit(EXIT_FAILURE);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* serious hack into osmo_fsm */</span><br><span> lchan->fi->state = LCHAN_ST_ESTABLISHED;</span><br><span> lchan->ts->fi->state = TS_ST_IN_USE;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->type = full_rate ? GSM_LCHAN_TCH_F : GSM_LCHAN_TCH_H;</span><br><span> </span><br><span> if (lchan->ts->pchan_on_init == GSM_PCHAN_TCH_F_TCH_H_PDCH)</span><br><span> lchan->ts->pchan_is = full_rate ? GSM_PCHAN_TCH_F : GSM_PCHAN_TCH_H;</span><br><span>@@ -425,6 +417,102 @@</span><br><span> return lchan;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct gsm_lchan *create_lchan(struct gsm_bts *bts, int full_rate, const char *codec)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_lchan *lchan;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan = lchan_select_by_type(bts, (full_rate) ? GSM_LCHAN_TCH_F : GSM_LCHAN_TCH_H);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!lchan) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("No resource for lchan\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(EXIT_FAILURE);</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%);">+ return lchan_act(lchan, full_rate, codec);</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%);">+static void lchan_clear(struct gsm_lchan *lchan)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_release(lchan, true, false, 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%);">+static void ts_clear(struct gsm_bts_trx_ts *ts)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_lchan *lchan;</span><br><span style="color: hsl(120, 100%, 40%);">+ ts_for_each_lchan(lchan, ts) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan_state_is(lchan, LCHAN_ST_UNUSED))</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_clear(lchan);</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%);">+bool set_ts_use(int bts_nr, int trx_nr, const char * const *ts_use)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx *trx;</span><br><span style="color: hsl(120, 100%, 40%);">+ int i;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts = gsm_bts_num(bsc_gsmnet, bts_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ trx = gsm_bts_trx_num(bts, trx_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(trx);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "Setting TS use:");</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < 8; i++)</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "\t%s", ts_use[i]);</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < 8; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx_ts *ts = &trx->ts[i];</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *want_use = ts_use[i];</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *is_use = ts_use_str(ts);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!strcmp(want_use, "*"))</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If it is already as desired, don't change anything */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!strcmp(want_use, is_use))</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!strcmp(want_use, "TCH/F")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ts_is_capable_of_pchan(ts, GSM_PCHAN_TCH_F)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("Error: bts %d trx %d ts %d cannot be used as TCH/F\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_nr, trx_nr, i);</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ ts_clear(ts);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_act(&ts->lchan[0], true, "AMR");</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (!strcmp(want_use, "TCH/H-")</span><br><span style="color: hsl(120, 100%, 40%);">+ || !strcmp(want_use, "TCH/HH")</span><br><span style="color: hsl(120, 100%, 40%);">+ || !strcmp(want_use, "TCH/-H")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ bool act[2];</span><br><span style="color: hsl(120, 100%, 40%);">+ int j;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ts_is_capable_of_pchan(ts, GSM_PCHAN_TCH_H)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("Error: bts %d trx %d ts %d cannot be used as TCH/H\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_nr, trx_nr, i);</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</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%);">+ if (ts->pchan_is != GSM_PCHAN_TCH_H)</span><br><span style="color: hsl(120, 100%, 40%);">+ ts_clear(ts);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ act[0] = want_use[4] == 'H';</span><br><span style="color: hsl(120, 100%, 40%);">+ act[1] = want_use[5] == 'H';</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (j = 0; j < 2; j++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan_state_is(&ts->lchan[j], LCHAN_ST_UNUSED)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (act[j])</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_act(&ts->lchan[j], false, "AMR");</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (!act[j])</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_clear(&ts->lchan[j]);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (!strcmp(want_use, "-") || !strcmp(want_use, "PDCH")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ts_clear(ts);</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%);">+ return true;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* parse channel request */</span><br><span> </span><br><span> static int got_chan_req = 0;</span><br><span>@@ -2018,6 +2106,26 @@</span><br><span> return EXIT_FAILURE;</span><br><span> test_case += 1 + 2 + 8;</span><br><span> } else</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!strcmp(*test_case, "set-ts-use")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* set-ts-use <bts-nr> <trx-nr> 8x<ts-use></span><br><span style="color: hsl(120, 100%, 40%);">+ * e.g.</span><br><span style="color: hsl(120, 100%, 40%);">+ * set-ts-use 0 0 * TCH/F - - TCH/H- TCH/HH TCH/-H PDCH</span><br><span style="color: hsl(120, 100%, 40%);">+ * '*': keep as is</span><br><span style="color: hsl(120, 100%, 40%);">+ * TCH/F: one FR call.</span><br><span style="color: hsl(120, 100%, 40%);">+ * TCH/H-: HR TS with first subslot used as TCH/H, other subslot unused.</span><br><span style="color: hsl(120, 100%, 40%);">+ * TCH/HH: HR TS with both subslots used as TCH/H</span><br><span style="color: hsl(120, 100%, 40%);">+ * TCH/-H: HR TS with only second subslot used as TCH/H</span><br><span style="color: hsl(120, 100%, 40%);">+ * PDCH: TS used for PDCH (e.g. unused dynamic TS)</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+ int bts_nr = atoi(test_case[1]);</span><br><span style="color: hsl(120, 100%, 40%);">+ int trx_nr = atoi(test_case[2]);</span><br><span style="color: hsl(120, 100%, 40%);">+ const char * const * ts_use = (void*)&test_case[3];</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!set_ts_use(bts_nr, trx_nr, ts_use))</span><br><span style="color: hsl(120, 100%, 40%);">+ return EXIT_FAILURE;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!expect_ts_use(bts_nr, trx_nr, ts_use))</span><br><span style="color: hsl(120, 100%, 40%);">+ return EXIT_FAILURE;</span><br><span style="color: hsl(120, 100%, 40%);">+ test_case += 1 + 2 + 8;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else</span><br><span> if (!strcmp(*test_case, "print")) {</span><br><span> fprintf(stderr, "\n%s\n\n", test_case[1]);</span><br><span> test_case += 2;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21198">change 21198</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/+/21198"/><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: I6e90679bf22609fb72e53e3d11748a4070a38159 </div>
<div style="display:none"> Gerrit-Change-Number: 21198 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </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>