<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24931">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">handover_test: also show when an lchan is busy<br><br>In expect-ts-use, indicate a busy lchan with letter '!'.<br><br>The code is a bit complex because of the choice made earlier to show two<br>TCH/H subslots as "TCH/HH", "TCH/H-" or "TCH/-H" depending on the<br>subslot states:<br>- show "-" as a shorthand for "all subslots UNUSED"<br>- show a "TCH/" prefix only when there is any "H" or "F" following, i.e.<br> when any subslot is actually established<br>- if a subslot is busy (any other state besides ESTABLISHED and UNUSED),<br> indicate the subslot as '!'.<br><br>The spectrum of reported state strings for TCH/F is:<br><br> TCH/F ! -<br><br>For TCH/H:<br><br> TCH/HH TCH/H- TCH/-H TCH/H! TCH/!H !- -! -<br><br>The only current test affected is test_penalty_timer.ho_vty, where a<br>failed handover leaves an lchan in LCHAN_ST_WAIT_AFTER_ERROR. Adjust<br>that test.<br><br>Rationale: I will soon add tests to verify the accurate timeout of a<br>handover2 penalty timer. While implementing, I noticed that immediate<br>retry of the handover ends up in timeslot 2, because timeslot 1 is still<br>in WAIT_AFTER_ERROR. Instead of working around that, I would like to<br>explicitly show the error state in the test -- it is an important<br>aspect.<br><br>Related: SYS#5198<br>Change-Id: I735ce7e2c3e0e450d3f76047d7e47691fe889cad<br>---<br>M tests/handover/handover_test.c<br>M tests/handover/test_penalty_timer.ho_vty<br>2 files changed, 33 insertions(+), 13 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/31/24931/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 2c97f78..60a31be 100644</span><br><span>--- a/tests/handover/handover_test.c</span><br><span>+++ b/tests/handover/handover_test.c</span><br><span>@@ -287,6 +287,34 @@</span><br><span> return bts;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+char *lchans_use_str(struct gsm_bts_trx_ts *ts, const char *established_prefix, char established_char)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ char state_chars[8] = { 0 };</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_lchan *lchan;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool any_lchans_established = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool any_lchans_in_use = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ ts_for_n_lchans(lchan, ts, ts->max_primary_lchans) {</span><br><span style="color: hsl(120, 100%, 40%);">+ char state_char;</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%);">+ state_char = '-';</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ any_lchans_in_use = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan_state_is(lchan, LCHAN_ST_ESTABLISHED)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ any_lchans_established = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ state_char = established_char;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ state_char = '!';</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%);">+ state_chars[lchan->nr] = state_char;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!any_lchans_in_use)</span><br><span style="color: hsl(120, 100%, 40%);">+ return "-";</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!any_lchans_established)</span><br><span style="color: hsl(120, 100%, 40%);">+ established_prefix = "";</span><br><span style="color: hsl(120, 100%, 40%);">+ return talloc_asprintf(OTC_SELECT, "%s%s", established_prefix, state_chars);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> const char *ts_use_str(struct gsm_bts_trx_ts *ts)</span><br><span> {</span><br><span> switch (ts->pchan_is) {</span><br><span>@@ -297,20 +325,10 @@</span><br><span> return "-";</span><br><span> </span><br><span> case GSM_PCHAN_TCH_F:</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan_state_is(&ts->lchan[0], LCHAN_ST_ESTABLISHED))</span><br><span style="color: hsl(0, 100%, 40%);">- return "TCH/F";</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- return "-";</span><br><span style="color: hsl(120, 100%, 40%);">+ return lchans_use_str(ts, "TCH/", 'F');</span><br><span> </span><br><span> case GSM_PCHAN_TCH_H:</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan_state_is(&ts->lchan[0], LCHAN_ST_ESTABLISHED)</span><br><span style="color: hsl(0, 100%, 40%);">- && lchan_state_is(&ts->lchan[1], LCHAN_ST_ESTABLISHED))</span><br><span style="color: hsl(0, 100%, 40%);">- return "TCH/HH";</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan_state_is(&ts->lchan[0], LCHAN_ST_ESTABLISHED))</span><br><span style="color: hsl(0, 100%, 40%);">- return "TCH/H-";</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan_state_is(&ts->lchan[1], LCHAN_ST_ESTABLISHED))</span><br><span style="color: hsl(0, 100%, 40%);">- return "TCH/-H";</span><br><span style="color: hsl(0, 100%, 40%);">- return "-";</span><br><span style="color: hsl(120, 100%, 40%);">+ return lchans_use_str(ts, "TCH/", 'H');</span><br><span> </span><br><span> default:</span><br><span> return gsm_pchan_name(ts->pchan_is);</span><br><span>diff --git a/tests/handover/test_penalty_timer.ho_vty b/tests/handover/test_penalty_timer.ho_vty</span><br><span>index 7528a0f..22b9a95 100644</span><br><span>--- a/tests/handover/test_penalty_timer.ho_vty</span><br><span>+++ b/tests/handover/test_penalty_timer.ho_vty</span><br><span>@@ -9,7 +9,9 @@</span><br><span> expect-chan lchan 1 0 1 0</span><br><span> expect-ho-cmd lchan 0 0 1 0</span><br><span> ho-failed</span><br><span style="color: hsl(120, 100%, 40%);">+# first BTS still services the call:</span><br><span> expect-ts-use trx 0 0 states * TCH/F - - - - - -</span><br><span style="color: hsl(0, 100%, 40%);">-expect-ts-use trx 1 0 states * - - - - - - -</span><br><span style="color: hsl(120, 100%, 40%);">+# lchan 1 0 1 0 is in LCHAN_ST_WAIT_AFTER_ERROR because the handover failed:</span><br><span style="color: hsl(120, 100%, 40%);">+expect-ts-use trx 1 0 states * ! - - - - - -</span><br><span> meas-rep lchan 0 0 1 0 rxlev 20 rxqual 0 ta 0 neighbors 30</span><br><span> expect-no-chan</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24931">change 24931</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/+/24931"/><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: I735ce7e2c3e0e450d3f76047d7e47691fe889cad </div>
<div style="display:none"> Gerrit-Change-Number: 24931 </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>