diff --git a/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py b/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py index 82e357c5..4fe4e465 100755 --- a/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py +++ b/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py @@ -16,8 +16,4 @@ def my_bts_setup(bts): bts.set_trx_phy_channel(0, 6, 'TCH/F_PDCH') bts.set_trx_phy_channel(0, 7, 'PDCH') -#FIXME: if we don't enable gprs (gprs none in BSC vty) then dyn chans are broken, see OS#3244 -# Once Fixed, add a new test with following test: -#call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=False) - call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=True) diff --git a/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa_no_gprs.py b/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa_no_gprs.py new file mode 100755 index 00000000..c1349aeb --- /dev/null +++ b/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa_no_gprs.py @@ -0,0 +1,21 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +import testlib +suite.test_import_modules_register_for_cleanup(testlib) +from testlib import call_test_setup_run + +def my_bts_setup(bts): + bts.set_num_trx(1) + bts.set_trx_phy_channel(0, 0, 'CCCH+SDCCH4') + bts.set_trx_phy_channel(0, 1, 'SDCCH8') + bts.set_trx_phy_channel(0, 2, 'TCH/F_PDCH') + bts.set_trx_phy_channel(0, 3, 'TCH/F_PDCH') + bts.set_trx_phy_channel(0, 4, 'TCH/F_PDCH') + bts.set_trx_phy_channel(0, 5, 'TCH/F_PDCH') + bts.set_trx_phy_channel(0, 6, 'TCH/F_PDCH') + bts.set_trx_phy_channel(0, 7, 'TCH/F_PDCH') + +# Check that dynamic timeslots work fine with gprs disabled. + +call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=False) diff --git a/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py b/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py index 1424da80..b9b79357 100755 --- a/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py +++ b/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py @@ -16,8 +16,4 @@ def my_bts_setup(bts): bts.set_trx_phy_channel(0, 6, 'TCH/F_TCH/H_PDCH') bts.set_trx_phy_channel(0, 7, 'PDCH') -#FIXME: if we don't enable gprs (gprs none in BSC vty) then dyn chans are broken, see OS#3244 -# Once Fixed, add a new test with following test: -#call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=False) - call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=True) diff --git a/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo_no_gprs.py b/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo_no_gprs.py new file mode 100755 index 00000000..d80d27a4 --- /dev/null +++ b/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo_no_gprs.py @@ -0,0 +1,21 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +import testlib +suite.test_import_modules_register_for_cleanup(testlib) +from testlib import call_test_setup_run + +def my_bts_setup(bts): + bts.set_num_trx(1) + bts.set_trx_phy_channel(0, 0, 'CCCH+SDCCH4') + bts.set_trx_phy_channel(0, 1, 'SDCCH8') + bts.set_trx_phy_channel(0, 2, 'TCH/F_TCH/H_PDCH') + bts.set_trx_phy_channel(0, 3, 'TCH/F_TCH/H_PDCH') + bts.set_trx_phy_channel(0, 4, 'TCH/F_TCH/H_PDCH') + bts.set_trx_phy_channel(0, 5, 'TCH/F_TCH/H_PDCH') + bts.set_trx_phy_channel(0, 6, 'TCH/F_TCH/H_PDCH') + bts.set_trx_phy_channel(0, 7, 'TCH/F_TCH/H_PDCH') + +# Check that dynamic timeslots work fine with gprs disabled. + +call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=False)