<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24360">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">handover_test: fix naming/wording: 'handover-req' should be 'handover-cmd'<br><br>Related: SYS#5315 OS#4940 OS#3277<br>Change-Id: I0c20971590e4b1a19f77ff3f15d58992eeebfbd9<br>---<br>M tests/handover/handover_test.c<br>M tests/handover/test_max_handovers.ho_vty<br>M tests/handover/test_penalty_timer.ho_vty<br>3 files changed, 29 insertions(+), 29 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/60/24360/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 e534152..9bfb789 100644</span><br><span>--- a/tests/handover/handover_test.c</span><br><span>+++ b/tests/handover/handover_test.c</span><br><span>@@ -532,8 +532,8 @@</span><br><span> static struct gsm_lchan *new_chan_req = NULL;</span><br><span> static struct gsm_lchan *last_chan_req = NULL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct gsm_lchan *new_ho_req = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-static struct gsm_lchan *last_ho_req = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+static struct gsm_lchan *new_ho_cmd = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+static struct gsm_lchan *last_ho_cmd = NULL;</span><br><span> </span><br><span> /* send channel activation ack */</span><br><span> static void send_chan_act_ack(struct gsm_lchan *lchan, int act)</span><br><span>@@ -701,12 +701,12 @@</span><br><span> switch (gh->msg_type) {</span><br><span> case GSM48_MT_RR_HANDO_CMD:</span><br><span> case GSM48_MT_RR_ASS_CMD:</span><br><span style="color: hsl(0, 100%, 40%);">- if (new_ho_req) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Test script is erratic: a handover is requested"</span><br><span style="color: hsl(0, 100%, 40%);">- " while a previous handover request is still unhandled\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (new_ho_cmd) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "Test script is erratic: seen a Handover Command"</span><br><span style="color: hsl(120, 100%, 40%);">+ " while a previous Handover Command is still unhandled\n");</span><br><span> exit(1);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- new_ho_req = lchan;</span><br><span style="color: hsl(120, 100%, 40%);">+ new_ho_cmd = lchan;</span><br><span> break;</span><br><span> }</span><br><span> break;</span><br><span>@@ -1015,27 +1015,27 @@</span><br><span> send_chan_act_ack(lchan, 1);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void _expect_ho_req(struct gsm_lchan *lchan)</span><br><span style="color: hsl(120, 100%, 40%);">+static void _expect_ho_cmd(struct gsm_lchan *lchan)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "- Expecting handover/assignment request at %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "- Expecting Handover/Assignment Command at %s\n",</span><br><span> gsm_lchan_name(lchan));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!new_ho_req) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Test failed, because no handover was requested\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!new_ho_cmd) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "Test failed, no Handover Command\n");</span><br><span> exit(1);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, " * Got handover/assignment request at %s\n", gsm_lchan_name(new_ho_req));</span><br><span style="color: hsl(0, 100%, 40%);">- if (new_ho_req != lchan) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Test failed, because handover/assignment was not commanded on the expected lchan\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, " * Got Handover/Assignment Command at %s\n", gsm_lchan_name(new_ho_cmd));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (new_ho_cmd != lchan) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "Test failed, Handover/Assignment Command not on the expected lchan\n");</span><br><span> exit(1);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- last_ho_req = new_ho_req;</span><br><span style="color: hsl(0, 100%, 40%);">- new_ho_req = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ last_ho_cmd = new_ho_cmd;</span><br><span style="color: hsl(120, 100%, 40%);">+ new_ho_cmd = NULL;</span><br><span> }</span><br><span> </span><br><span> DEFUN(expect_chan, expect_chan_cmd,</span><br><span> "expect-chan " LCHAN_ARGS,</span><br><span style="color: hsl(0, 100%, 40%);">- "Expect a channel request from BSC to a cell for a specific lchan\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Expect RSL Channel Activation of a specific lchan\n"</span><br><span> LCHAN_ARGS_DOC)</span><br><span> {</span><br><span> VTY_ECHO();</span><br><span>@@ -1043,13 +1043,13 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(expect_ho_req, expect_ho_req_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "expect-ho-req " LCHAN_ARGS,</span><br><span style="color: hsl(0, 100%, 40%);">- "Expect a handover of a given lchan\n"</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(expect_handover_command, expect_handover_command_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "expect-ho-cmd " LCHAN_ARGS,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Expect an RR Handover Command sent to a specific lchan\n"</span><br><span> LCHAN_ARGS_DOC)</span><br><span> {</span><br><span> VTY_ECHO();</span><br><span style="color: hsl(0, 100%, 40%);">- _expect_ho_req(parse_lchan_args(argv));</span><br><span style="color: hsl(120, 100%, 40%);">+ _expect_ho_cmd(parse_lchan_args(argv));</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -1075,12 +1075,12 @@</span><br><span> fprintf(stderr, "Cannot ack handover/assignment, because no chan request\n");</span><br><span> exit(1);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (!last_ho_req) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!last_ho_cmd) {</span><br><span> fprintf(stderr, "Cannot ack handover/assignment, because no ho request\n");</span><br><span> exit(1);</span><br><span> }</span><br><span> send_ho_complete(last_chan_req, true);</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_release_ack(last_ho_req);</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_release_ack(last_ho_cmd);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -1096,7 +1096,7 @@</span><br><span> VTY_ECHO();</span><br><span> </span><br><span> _expect_chan_activ(to);</span><br><span style="color: hsl(0, 100%, 40%);">- _expect_ho_req(from);</span><br><span style="color: hsl(120, 100%, 40%);">+ _expect_ho_cmd(from);</span><br><span> send_ho_detect(to);</span><br><span> send_ho_complete(to, true);</span><br><span> lchan_release_ack(from);</span><br><span>@@ -1112,11 +1112,11 @@</span><br><span> fprintf(stderr, "Cannot fail handover, because no chan request\n");</span><br><span> exit(1);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (!last_ho_req) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!last_ho_cmd) {</span><br><span> fprintf(stderr, "Cannot fail handover, because no handover request\n");</span><br><span> exit(1);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- send_ho_complete(last_ho_req, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ send_ho_complete(last_ho_cmd, false);</span><br><span> lchan_release_ack(last_chan_req);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -1187,7 +1187,7 @@</span><br><span> install_element(CONFIG_NODE, &congestion_check_cmd);</span><br><span> install_element(CONFIG_NODE, &expect_no_chan_cmd);</span><br><span> install_element(CONFIG_NODE, &expect_chan_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element(CONFIG_NODE, &expect_ho_req_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(CONFIG_NODE, &expect_handover_command_cmd);</span><br><span> install_element(CONFIG_NODE, &ho_detection_cmd);</span><br><span> install_element(CONFIG_NODE, &ho_complete_cmd);</span><br><span> install_element(CONFIG_NODE, &expect_ho_cmd);</span><br><span>diff --git a/tests/handover/test_max_handovers.ho_vty b/tests/handover/test_max_handovers.ho_vty</span><br><span>index e5d9ef5..76a9ea9 100644</span><br><span>--- a/tests/handover/test_max_handovers.ho_vty</span><br><span>+++ b/tests/handover/test_max_handovers.ho_vty</span><br><span>@@ -9,10 +9,10 @@</span><br><span> set-ts-use trx 0 0 states * TCH/F TCH/F TCH/F - - - -</span><br><span> meas-rep lchan 0 0 1 0 rxlev 0 rxqual 0 ta 0 neighbors 30</span><br><span> expect-chan lchan 1 0 1 0</span><br><span style="color: hsl(0, 100%, 40%);">-expect-ho-req lchan 0 0 1 0</span><br><span style="color: hsl(120, 100%, 40%);">+expect-ho-cmd lchan 0 0 1 0</span><br><span> meas-rep lchan 0 0 2 0 rxlev 0 rxqual 0 ta 0 neighbors 30</span><br><span> expect-chan lchan 1 0 2 0</span><br><span style="color: hsl(0, 100%, 40%);">-expect-ho-req lchan 0 0 2 0</span><br><span style="color: hsl(120, 100%, 40%);">+expect-ho-cmd lchan 0 0 2 0</span><br><span> meas-rep lchan 0 0 3 0 rxlev 0 rxqual 0 ta 0 neighbors 30</span><br><span> expect-no-chan</span><br><span> </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 7b0d266..7528a0f 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>@@ -7,7 +7,7 @@</span><br><span> set-ts-use trx 0 0 states * TCH/F - - - - - -</span><br><span> meas-rep lchan 0 0 1 0 rxlev 20 rxqual 0 ta 0 neighbors 30</span><br><span> expect-chan lchan 1 0 1 0</span><br><span style="color: hsl(0, 100%, 40%);">-expect-ho-req lchan 0 0 1 0</span><br><span style="color: hsl(120, 100%, 40%);">+expect-ho-cmd lchan 0 0 1 0</span><br><span> ho-failed</span><br><span> expect-ts-use trx 0 0 states * TCH/F - - - - - -</span><br><span> expect-ts-use trx 1 0 states * - - - - - - -</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24360">change 24360</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/+/24360"/><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: I0c20971590e4b1a19f77ff3f15d58992eeebfbd9 </div>
<div style="display:none"> Gerrit-Change-Number: 24360 </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>