diff options
| author | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2022-09-07 00:10:49 +0200 |
|---|---|---|
| committer | neels <nhofmeyr@sysmocom.de> | 2023-03-04 22:44:10 +0000 |
| commit | 7214e56b499c14fd371b24f4a74b1b763f0240bc (patch) | |
| tree | c7f9cfe0b216d27268d3709728a1250c457f9e7e /tests | |
| parent | 71e838ed025b0d543c1afe3a7dd87573367f38e3 (diff) | |
VTY,CTRL: add pchan dynamic/{osmocom,ipaccess}
We already use "OSMO_DYN" as C name for "fully dynamic" timeslot config,
when working with osmo-bsc.cfg I dearly miss this short name, it is a
pain / has become ridiculous to write 'tch/f_tch/h_sdcch8_pdch'.
Introduce 'dynamic/osmocom' and 'dynamic/ipaccess' as default names for
our dynamic timeslots on VTY and CTRL. The old 'tch/f_tch/h_sdcch8_pdch'
and 'tch/f_pdch' are still supported.
Change-Id: I37719edd867c777d1ce944b8e2f1efffac38f00e
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/ctrl_test_runner.py | 4 | ||||
| -rw-r--r-- | tests/timeslot.vty | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/tests/ctrl_test_runner.py b/tests/ctrl_test_runner.py index 587f9e232..e88999282 100755 --- a/tests/ctrl_test_runner.py +++ b/tests/ctrl_test_runner.py @@ -233,8 +233,8 @@ class TestCtrlBSC(TestCtrlBase): self.assertEqual(r['mtype'], 'GET_REPLY') self.assertEqual(r['value'], 'CCCH+SDCCH4,0,0 TCH/F,0,0 TCH/H,0,0 SDCCH8,0,0' - + ' TCH/F_PDCH,0,0 CCCH+SDCCH4+CBCH,0,0' - + ' SDCCH8+CBCH,0,0 TCH/F_TCH/H_SDCCH8_PDCH,0,0') + + ' DYNAMIC/IPACCESS,0,0 CCCH+SDCCH4+CBCH,0,0' + + ' SDCCH8+CBCH,0,0 DYNAMIC/OSMOCOM,0,0') def testBtsOmlConnectionState(self): """Check OML state. It will not be connected""" diff --git a/tests/timeslot.vty b/tests/timeslot.vty index 0a2f01c31..8d0c70b05 100644 --- a/tests/timeslot.vty +++ b/tests/timeslot.vty @@ -7,7 +7,7 @@ OsmoBSC(config-net-bts-trx)# timeslot 0 OsmoBSC(config-net-bts-trx-ts)# list ... - phys_chan_config (none|ccch|ccch+sdcch4|tch/f|tch/h|sdcch8|pdch|tch/f_pdch|unknown|ccch+sdcch4+cbch|sdcch8+cbch|tch/f_tch/h_sdcch8_pdch) + phys_chan_config (none|ccch|ccch+sdcch4|tch/f|tch/h|sdcch8|pdch|dynamic/ipaccess|unknown|ccch+sdcch4+cbch|sdcch8+cbch|dynamic/osmocom|tch/f_pdch|tch/f_tch/h_sdcch8_pdch) training_sequence_code <0-7> hopping enabled (0|1) hopping sequence-number <0-63> @@ -28,11 +28,13 @@ OsmoBSC(config-net-bts-trx-ts)# phys_chan_config ? tch/h 2 TCH/H + 2 FACCH/H + 2 SACCH (Comb. II) sdcch8 8 SDCCH + 4 SACCH (Comb. VII) pdch Packet Data Channel for GPRS/EDGE - tch/f_pdch Dynamic TCH/F or GPRS PDCH + dynamic/ipaccess Dynamic TCH/F or GPRS PDCH (dynamic/ipaccess is an alias for tch/f_pdch) unknown Unknown / Unsupported channel combination ccch+sdcch4+cbch FCCH + SCH + BCCH + CCCH + CBCH + 3 SDCCH + 2 SACCH (Comb. V) sdcch8+cbch 7 SDCCH + 4 SACCH + CBCH (Comb. VII) - tch/f_tch/h_sdcch8_pdch Dynamic TCH/F or TCH/H or SDCCH/8 or GPRS PDCH + dynamic/osmocom Dynamic TCH/F or TCH/H or SDCCH/8 or GPRS PDCH (dynamic/osmocom is an alias for tch/f_tch/h_sdcch8_pdch) + tch/f_pdch Dynamic TCH/F or GPRS PDCH (dynamic/ipaccess is an alias for tch/f_pdch) + tch/f_tch/h_sdcch8_pdch Dynamic TCH/F or TCH/H or SDCCH/8 or GPRS PDCH (dynamic/osmocom is an alias for tch/f_tch/h_sdcch8_pdch) OsmoBSC(config-net-bts-trx-ts)# phys_chan_config none OsmoBSC(config-net-bts-trx-ts)# show running-config @@ -67,5 +69,5 @@ OsmoBSC(config-net-bts-trx-ts)# show running-config trx 0 ... timeslot 0 - phys_chan_config TCH/F_TCH/H_SDCCH8_PDCH + phys_chan_config DYNAMIC/OSMOCOM ... |