handover_test: include ack-chan in expect-chan

Change-Id: Ic9f1e94b12334fed6bdce35beef94d8e2968f3ad
This commit is contained in:
Neels Hofmeyr 2021-01-05 12:20:11 +01:00 committed by laforge
parent 3f1c43e74b
commit 351e0f1002
2 changed files with 0 additions and 17 deletions

View File

@ -971,11 +971,6 @@ static void _expect_chan_activ(struct gsm_lchan *lchan)
gsm_lchan_name(lchan), gsm_lchan_name(chan_req_lchan));
exit(1);
}
}
static void _ack_chan_activ(struct gsm_lchan *lchan)
{
fprintf(stderr, "- Acknowledging channel request on %s\n", gsm_lchan_name(lchan));
got_ho_req = 0;
send_chan_act_ack(lchan, 1);
}
@ -1005,15 +1000,6 @@ DEFUN(expect_chan, expect_chan_cmd,
return CMD_SUCCESS;
}
DEFUN(ack_chan, ack_chan_cmd,
"ack-chan",
"ACK a previous Channel Request\n")
{
OSMO_ASSERT(got_chan_req);
_ack_chan_activ(chan_req_lchan);
return CMD_SUCCESS;
}
DEFUN(expect_ho_req, expect_ho_req_cmd,
"expect-ho-req " LCHAN_ARGS,
"Expect a handover of a given lchan\n"
@ -1067,7 +1053,6 @@ DEFUN(expect_ho, expect_ho_cmd,
struct gsm_lchan *to = parse_lchan_args(argv+4);
_expect_chan_activ(to);
_ack_chan_activ(to);
_expect_ho_req(from);
send_ho_detect(to);
send_ho_complete(to, true);
@ -1152,7 +1137,6 @@ static void ho_test_vty_init()
install_element(CONFIG_NODE, &congestion_check_cmd);
install_element(CONFIG_NODE, &expect_no_chan_cmd);
install_element(CONFIG_NODE, &expect_chan_cmd);
install_element(CONFIG_NODE, &ack_chan_cmd);
install_element(CONFIG_NODE, &expect_ho_req_cmd);
install_element(CONFIG_NODE, &ho_detection_cmd);
install_element(CONFIG_NODE, &ho_complete_cmd);

View File

@ -7,7 +7,6 @@ create-n-bts 2
set-ts-use trx 0 0 states * TCH/F - - - - - -
meas-rep lchan 0 0 1 0 rxlev 20 rxqual 0 ta 0 neighbors 30
expect-chan lchan 1 0 1 0
ack-chan
expect-ho-req lchan 0 0 1 0
ho-failed
expect-ts-use trx 0 0 states * TCH/F - - - - - -