BTS_Tests: keep pchan configuration unchanged in TC_pcu_*
Change [1] fixes support of dynamic timeslots in osmo-bts-virtual,
so we don't need to change the pchan configuration anymore.
Change-Id: I98397ac0fc17ece8f0e41b1ef1c158b47c9de026
Related: [1] osmo-bts.git I5db5b7dd6a8e84cf9a0d84f04a650c2ed8a4e368
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 9d7ab65..c55f962 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -5509,7 +5509,7 @@
testcase TC_pcu_data_req_wrong_bts() runs on test_CT {
var octetstring data := '0000'O & f_rnd_octstring(21);
- f_virtphy_common();
+ f_TC_pcu_init();
f_TC_pcu_act_req(0, 0, 7, true);
f_TC_pcu_l1ctl_est_pdch(7);
@@ -5522,7 +5522,7 @@
testcase TC_pcu_data_req_wrong_trx() runs on test_CT {
var octetstring data := '0000'O & f_rnd_octstring(21);
- f_virtphy_common();
+ f_TC_pcu_init();
f_TC_pcu_act_req(0, 0, 7, true);
f_TC_pcu_l1ctl_est_pdch(7);
@@ -5535,7 +5535,7 @@
testcase TC_pcu_data_req_wrong_ts() runs on test_CT {
var octetstring data := '0000'O & f_rnd_octstring(21);
- f_virtphy_common();
+ f_TC_pcu_init();
f_TC_pcu_act_req(0, 0, 7, true);
f_TC_pcu_l1ctl_est_pdch(7);
@@ -5548,7 +5548,7 @@
testcase TC_pcu_data_req_ts_inactive() runs on test_CT {
var octetstring data := '0000'O & f_rnd_octstring(21);
- f_virtphy_common();
+ f_TC_pcu_init();
/* intentionally not calling f_TC_pcu_act_req() */
f_TC_pcu_l1ctl_est_pdch(7);
@@ -5593,18 +5593,8 @@
}
}
-private function f_disable_dynamic_ts() runs on test_CT
-{
- f_init_vty_bsc();
- /* I'm not quite sure why we need this with osmo-bts-virtual. Somehow it deosn't seem to
- * support dynamic timeslots? But it uses the same scheduler as osmo-bts-trx ?!? */
- f_vty_config2(BSCVTY, {"network", "bts 0", "trx 0", "timeslot 3"}, "phys_chan_config TCH/F");
- f_vty_config2(BSCVTY, {"network", "bts 0", "trx 0", "timeslot 4"}, "phys_chan_config TCH/F");
+private function f_TC_pcu_init() runs on test_CT {
f_init_with_pcuif();
-}
-
-private function f_virtphy_common() runs on test_CT {
- f_disable_dynamic_ts();
f_init_l1ctl();
f_l1_tune(L1CTL);
}
@@ -5612,7 +5602,7 @@
testcase TC_pcu_data_req_pdtch() runs on test_CT {
var octetstring data := '0000'O & f_rnd_octstring(21);
- f_virtphy_common();
+ f_TC_pcu_init();
f_TC_pcu_act_req(0, 0, 7, true);
f_TC_pcu_l1ctl_est_pdch(7);
@@ -5624,7 +5614,7 @@
testcase TC_pcu_data_req_ptcch() runs on test_CT {
var octetstring data := '0000'O & f_rnd_octstring(21);
- f_virtphy_common();
+ f_TC_pcu_init();
f_TC_pcu_act_req(0, 0, 7, true);
f_TC_pcu_l1ctl_est_pdch(7);