pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18756 )
Change subject: tests: Replace is_connected() with is_registered() ...................................................................... tests: Replace is_connected() with is_registered() API was renamed and old name deprecated, let's use it everywhere. Change-Id: Ic91dddcfd1a5a17c35d15a8a14628b3923229523 --- M doc/examples/2g_osmocom/suites/sms/mo_mt_sms.py M doc/examples/4g_srsLTE/suites/4g/iperf3_dl.py M doc/examples/4g_srsLTE/suites/4g/iperf3_ul.py M doc/examples/4g_srsLTE/suites/4g/ping.py M src/osmo_gsm_tester/obj/ms_ofono.py M sysmocom/suites/debug/interactive.py M sysmocom/suites/dynts/switch_tch_pdch.py M sysmocom/suites/encryption/lib/testlib.py M sysmocom/suites/gprs/lib/testlib.py M sysmocom/suites/gprs/ping.py M sysmocom/suites/gprs/ping_idle_ping.py M sysmocom/suites/nitb_debug/interactive.py M sysmocom/suites/nitb_netreg/register.py M sysmocom/suites/nitb_netreg/register_default.py M sysmocom/suites/nitb_smpp/esme_ms_sms_storeforward.py M sysmocom/suites/nitb_smpp/esme_ms_sms_transaction.py M sysmocom/suites/nitb_sms/mo_mt_sms.py M sysmocom/suites/nitb_ussd/assert_extension.py M sysmocom/suites/smpp/esme_ms_sms_storeforward.py M sysmocom/suites/smpp/esme_ms_sms_transaction.py M sysmocom/suites/sms/mo_mt_sms.py M sysmocom/suites/ussd/assert_extension.py M sysmocom/suites/voice/lib/testlib.py 23 files changed, 52 insertions(+), 56 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/56/18756/1 diff --git a/doc/examples/2g_osmocom/suites/sms/mo_mt_sms.py b/doc/examples/2g_osmocom/suites/sms/mo_mt_sms.py index 51e78c0..738a2d8 100755 --- a/doc/examples/2g_osmocom/suites/sms/mo_mt_sms.py +++ b/doc/examples/2g_osmocom/suites/sms/mo_mt_sms.py @@ -21,7 +21,7 @@ bsc.start() bts.start() -wait(bsc.bts_is_connected, bts) +wait(bsc.bts.is_registered, bts) hlr.subscriber_add(ms_mo) hlr.subscriber_add(ms_mt) @@ -33,8 +33,8 @@ ms_mt.log_info() print('waiting for modems to attach...') -wait(ms_mo.is_connected, msc.mcc_mnc()) -wait(ms_mt.is_connected, msc.mcc_mnc()) +wait(ms_mo.is_registered, msc.mcc_mnc()) +wait(ms_mt.is_registered, msc.mcc_mnc()) wait(msc.subscriber_attached, ms_mo, ms_mt) sms = ms_mo.sms_send(ms_mt) diff --git a/doc/examples/4g_srsLTE/suites/4g/iperf3_dl.py b/doc/examples/4g_srsLTE/suites/4g/iperf3_dl.py index d90c80b..b90f04f 100755 --- a/doc/examples/4g_srsLTE/suites/4g/iperf3_dl.py +++ b/doc/examples/4g_srsLTE/suites/4g/iperf3_dl.py @@ -15,7 +15,7 @@ enb.start(epc) print('waiting for ENB to connect to EPC...') -wait(epc.enb_is_connected, enb) +wait(epc.enb.is_registered, enb) print('ENB is connected to EPC') ue.connect(enb) @@ -26,7 +26,7 @@ proc = iperf3cli.prepare_test_proc(iperf3cli.DIR_DL, ue.netns(), bitrate=max_rate) print('waiting for UE to attach...') -wait(ue.is_connected, None) +wait(ue.is_registered, None) print('UE is attached') print("Running iperf3 client to %s through %s" % (str(iperf3cli), ue.netns())) diff --git a/doc/examples/4g_srsLTE/suites/4g/iperf3_ul.py b/doc/examples/4g_srsLTE/suites/4g/iperf3_ul.py index 453cdfa..193cce6 100755 --- a/doc/examples/4g_srsLTE/suites/4g/iperf3_ul.py +++ b/doc/examples/4g_srsLTE/suites/4g/iperf3_ul.py @@ -15,7 +15,7 @@ enb.start(epc) print('waiting for ENB to connect to EPC...') -wait(epc.enb_is_connected, enb) +wait(epc.enb.is_registered, enb) print('ENB is connected to EPC') ue.connect(enb) @@ -26,7 +26,7 @@ proc = iperf3cli.prepare_test_proc(iperf3cli.DIR_UL, ue.netns(), bitrate=max_rate) print('waiting for UE to attach...') -wait(ue.is_connected, None) +wait(ue.is_registered, None) print('UE is attached') print("Running iperf3 client to %s through %s" % (str(iperf3cli), ue.netns())) diff --git a/doc/examples/4g_srsLTE/suites/4g/ping.py b/doc/examples/4g_srsLTE/suites/4g/ping.py index c81a35d..1712df3 100755 --- a/doc/examples/4g_srsLTE/suites/4g/ping.py +++ b/doc/examples/4g_srsLTE/suites/4g/ping.py @@ -11,12 +11,12 @@ enb.start(epc) print('waiting for ENB to connect to EPC...') -wait(epc.enb_is_connected, enb) +wait(epc.enb.is_registered, enb) print('ENB is connected to EPC') ue.connect(enb) print('waiting for UE to attach...') -wait(ue.is_connected, None) +wait(ue.is_registered, None) print('UE is attached') proc = ue.run_netns_wait('ping', ('ping', '-c', '10', epc.tun_addr())) diff --git a/src/osmo_gsm_tester/obj/ms_ofono.py b/src/osmo_gsm_tester/obj/ms_ofono.py index e03427e..cec6824 100644 --- a/src/osmo_gsm_tester/obj/ms_ofono.py +++ b/src/osmo_gsm_tester/obj/ms_ofono.py @@ -519,10 +519,6 @@ return True return False - def is_connected(self, mcc_mnc=None): - '''Convenience helper to keep old test API''' - return self.is_registered(mcc_mnc) - def schedule_scan_register(self, mcc_mnc): if self.register_attempts > NETREG_MAX_REGISTER_ATTEMPTS: raise log.Error('Failed to find Network Operator', mcc_mnc=mcc_mnc, attempts=self.register_attempts) @@ -547,7 +543,7 @@ # So far the easiest seems to check if we are now registered and # otherwise schedule a scan again. self.err('Scan() failed, retrying if needed:', e) - if not self.is_connected(mcc_mnc): + if not self.is_registered(mcc_mnc): self.schedule_scan_register(mcc_mnc) else: self.log('Already registered with network', mcc_mnc) @@ -632,7 +628,7 @@ self.cancel_pending_dbus_methods() self.power_cycle() self.register_attempts = 0 - if self.is_connected(mcc_mnc): + if self.is_registered(mcc_mnc): self.log('Already registered with', mcc_mnc if mcc_mnc else 'default network') else: self.log('Connect to', mcc_mnc if mcc_mnc else 'default network') diff --git a/sysmocom/suites/debug/interactive.py b/sysmocom/suites/debug/interactive.py index fa53cc8..a7f301a 100755 --- a/sysmocom/suites/debug/interactive.py +++ b/sysmocom/suites/debug/interactive.py @@ -27,7 +27,7 @@ bts.start() print('Waiting for bts to connect to bsc...') -wait(bsc.bts_is_connected, bts) +wait(bsc.bts.is_registered, bts) print('Waiting for bts to be ready...') wait(bts.ready_for_pcu) pcu.start() @@ -54,7 +54,7 @@ elif 'wait-registered'.startswith(cmd): try: for m in modems: - wait(m.is_connected, msc.mcc_mnc()) + wait(m.is_registered, msc.mcc_mnc()) wait(msc.subscriber_attached, *modems) except Timeout: print('Timeout while waiting for registration.') diff --git a/sysmocom/suites/dynts/switch_tch_pdch.py b/sysmocom/suites/dynts/switch_tch_pdch.py index 7be4be7..656c767 100755 --- a/sysmocom/suites/dynts/switch_tch_pdch.py +++ b/sysmocom/suites/dynts/switch_tch_pdch.py @@ -59,7 +59,7 @@ bsc.start() bts.start() -wait(bsc.bts_is_connected, bts) +wait(bsc.bts.is_registered, bts) print('Waiting for bts to be ready...') wait(bts.ready_for_pcu) pcu.start() @@ -76,8 +76,8 @@ ms_mt.log_info() print('waiting for modems to attach...') -wait(ms_mo.is_connected, msc.mcc_mnc()) -wait(ms_mt.is_connected, msc.mcc_mnc()) +wait(ms_mo.is_registered, msc.mcc_mnc()) +wait(ms_mt.is_registered, msc.mcc_mnc()) wait(msc.subscriber_attached, ms_mo) wait(msc.subscriber_attached, ms_mt) diff --git a/sysmocom/suites/encryption/lib/testlib.py b/sysmocom/suites/encryption/lib/testlib.py index ed76e6f..423592f 100644 --- a/sysmocom/suites/encryption/lib/testlib.py +++ b/sysmocom/suites/encryption/lib/testlib.py @@ -23,7 +23,7 @@ bsc.bts_add(bts) bsc.start() bts.start() - wait(bsc.bts_is_connected, bts) + wait(bsc.bts.is_registered, bts) ms.log_info() good_ki = ms.ki() @@ -39,7 +39,7 @@ sleep(40) # TODO: read pcap or CTRL interface and look for Rejected? (gsm_a.dtap.msg_mm_type == 0x04) print('Asserting modem did not register') # FIXME: this can fail because ofono qmi signals registered before being accepted by network. See OS#2458 - # assert not ms.is_connected(msc.mcc_mnc()) + # assert not ms.is_registered(msc.mcc_mnc()) assert not msc.subscriber_attached(ms) hlr.subscriber_delete(ms) @@ -50,5 +50,5 @@ else: print('Attempt connection with wrong KI, should work as it is not used...') ms.connect(msc.mcc_mnc()) - wait(ms.is_connected, msc.mcc_mnc()) + wait(ms.is_registered, msc.mcc_mnc()) wait(msc.subscriber_attached, ms) diff --git a/sysmocom/suites/gprs/lib/testlib.py b/sysmocom/suites/gprs/lib/testlib.py index 1421229..65b2a13 100644 --- a/sysmocom/suites/gprs/lib/testlib.py +++ b/sysmocom/suites/gprs/lib/testlib.py @@ -72,7 +72,7 @@ bsc.start() bts.start() - wait(bsc.bts_is_connected, bts) + wait(bsc.bts.is_registered, bts) print('Waiting for bts to be ready...') wait(bts.ready_for_pcu) pcu.start() @@ -85,7 +85,7 @@ print('waiting for modems to attach...') for ms in ms_li: - wait(ms.is_connected, msc.mcc_mnc()) + wait(ms.is_registered, msc.mcc_mnc()) wait(msc.subscriber_attached, *ms_li) print('waiting for modems to attach to data services...') diff --git a/sysmocom/suites/gprs/ping.py b/sysmocom/suites/gprs/ping.py index 9a7acde..a70db35 100755 --- a/sysmocom/suites/gprs/ping.py +++ b/sysmocom/suites/gprs/ping.py @@ -27,7 +27,7 @@ bsc.start() bts.start() -wait(bsc.bts_is_connected, bts) +wait(bsc.bts.is_registered, bts) print('Waiting for bts to be ready...') wait(bts.ready_for_pcu) pcu.start() @@ -40,7 +40,7 @@ ms.log_info() print('waiting for modems to attach...') -wait(ms.is_connected, msc.mcc_mnc()) +wait(ms.is_registered, msc.mcc_mnc()) wait(msc.subscriber_attached, ms) print('waiting for modems to attach to data services...') diff --git a/sysmocom/suites/gprs/ping_idle_ping.py b/sysmocom/suites/gprs/ping_idle_ping.py index 88ecbdb..8538685 100755 --- a/sysmocom/suites/gprs/ping_idle_ping.py +++ b/sysmocom/suites/gprs/ping_idle_ping.py @@ -32,7 +32,7 @@ bsc.start() bts.start() -wait(bsc.bts_is_connected, bts) +wait(bsc.bts.is_registered, bts) print('Waiting for bts to be ready...') wait(bts.ready_for_pcu) pcu.start() @@ -45,7 +45,7 @@ ms.log_info() print('waiting for modems to attach...') -wait(ms.is_connected, msc.mcc_mnc()) +wait(ms.is_registered, msc.mcc_mnc()) wait(msc.subscriber_attached, ms) print('waiting for modems to attach to data services...') diff --git a/sysmocom/suites/nitb_debug/interactive.py b/sysmocom/suites/nitb_debug/interactive.py index bd68a57..df40afd 100755 --- a/sysmocom/suites/nitb_debug/interactive.py +++ b/sysmocom/suites/nitb_debug/interactive.py @@ -10,7 +10,7 @@ nitb.bts_add(bts) nitb.start() bts.start() -wait(nitb.bts_is_connected, bts) +wait(nitb.bts.is_registered, bts) for m in modems: nitb.subscriber_add(m) @@ -31,7 +31,7 @@ elif 'wait-registered'.startswith(cmd): try: for m in modems: - wait(m.is_connected, nitb.mcc_mnc()) + wait(m.is_registered, nitb.mcc_mnc()) wait(nitb.subscriber_attached, *modems) except Timeout: print('Timeout while waiting for registration.') diff --git a/sysmocom/suites/nitb_netreg/register.py b/sysmocom/suites/nitb_netreg/register.py index fd171b3..11ac8a2 100755 --- a/sysmocom/suites/nitb_netreg/register.py +++ b/sysmocom/suites/nitb_netreg/register.py @@ -10,7 +10,7 @@ nitb.bts_add(bts) nitb.start() bts.start() -wait(nitb.bts_is_connected, bts) +wait(nitb.bts.is_registered, bts) nitb.subscriber_add(ms) @@ -18,5 +18,5 @@ print(ms.info()) -wait(ms.is_connected, nitb.mcc_mnc()) +wait(ms.is_registered, nitb.mcc_mnc()) wait(nitb.subscriber_attached, ms) diff --git a/sysmocom/suites/nitb_netreg/register_default.py b/sysmocom/suites/nitb_netreg/register_default.py index 6531049..3be0ec8 100755 --- a/sysmocom/suites/nitb_netreg/register_default.py +++ b/sysmocom/suites/nitb_netreg/register_default.py @@ -10,7 +10,7 @@ nitb.bts_add(bts) nitb.start() bts.start() -wait(nitb.bts_is_connected, bts) +wait(nitb.bts.is_registered, bts) nitb.subscriber_add(ms) @@ -18,5 +18,5 @@ print(ms.info()) -wait(ms.is_connected) +wait(ms.is_registered) wait(nitb.subscriber_attached, ms) diff --git a/sysmocom/suites/nitb_smpp/esme_ms_sms_storeforward.py b/sysmocom/suites/nitb_smpp/esme_ms_sms_storeforward.py index 29a5ced..879c39f 100755 --- a/sysmocom/suites/nitb_smpp/esme_ms_sms_storeforward.py +++ b/sysmocom/suites/nitb_smpp/esme_ms_sms_storeforward.py @@ -22,7 +22,7 @@ nitb.smsc.esme_add(esme) nitb.start() bts.start() -wait(nitb.bts_is_connected, bts) +wait(nitb.bts.is_registered, bts) esme.connect() nitb.subscriber_add(ms) @@ -38,7 +38,7 @@ print('MS registers and will receive the SMS...') ms.connect(nitb.mcc_mnc()) -wait(ms.is_connected, nitb.mcc_mnc()) +wait(ms.is_registered, nitb.mcc_mnc()) wait(nitb.subscriber_attached, ms) wait(ms.sms_was_received, msg) print('Waiting to receive and consume sms receipt with reference', umref) diff --git a/sysmocom/suites/nitb_smpp/esme_ms_sms_transaction.py b/sysmocom/suites/nitb_smpp/esme_ms_sms_transaction.py index 2963b6e..c7a0907 100755 --- a/sysmocom/suites/nitb_smpp/esme_ms_sms_transaction.py +++ b/sysmocom/suites/nitb_smpp/esme_ms_sms_transaction.py @@ -20,7 +20,7 @@ nitb.smsc.esme_add(esme) nitb.start() bts.start() -wait(nitb.bts_is_connected, bts) +wait(nitb.bts.is_registered, bts) esme.connect() nitb.subscriber_add(ms) @@ -28,7 +28,7 @@ ms.log_info() print('waiting for modem to attach...') -wait(ms.is_connected, nitb.mcc_mnc()) +wait(ms.is_registered, nitb.mcc_mnc()) wait(nitb.subscriber_attached, ms) print('sending first sms...') diff --git a/sysmocom/suites/nitb_sms/mo_mt_sms.py b/sysmocom/suites/nitb_sms/mo_mt_sms.py index d1cece6..480230a 100755 --- a/sysmocom/suites/nitb_sms/mo_mt_sms.py +++ b/sysmocom/suites/nitb_sms/mo_mt_sms.py @@ -10,7 +10,7 @@ nitb.bts_add(bts) nitb.start() bts.start() -wait(nitb.bts_is_connected, bts) +wait(nitb.bts.is_registered, bts) nitb.subscriber_add(ms_mo) nitb.subscriber_add(ms_mt) @@ -22,8 +22,8 @@ ms_mt.log_info() print('waiting for modems to attach...') -wait(ms_mo.is_connected, nitb.mcc_mnc()) -wait(ms_mt.is_connected, nitb.mcc_mnc()) +wait(ms_mo.is_registered, nitb.mcc_mnc()) +wait(ms_mt.is_registered, nitb.mcc_mnc()) wait(nitb.subscriber_attached, ms_mo, ms_mt) sms = ms_mo.sms_send(ms_mt) diff --git a/sysmocom/suites/nitb_ussd/assert_extension.py b/sysmocom/suites/nitb_ussd/assert_extension.py index 6246e61..bb99c00 100755 --- a/sysmocom/suites/nitb_ussd/assert_extension.py +++ b/sysmocom/suites/nitb_ussd/assert_extension.py @@ -11,7 +11,7 @@ nitb.bts_add(bts) nitb.start() bts.start() -wait(nitb.bts_is_connected, bts) +wait(nitb.bts.is_registered, bts) nitb.subscriber_add(ms) @@ -19,7 +19,7 @@ ms.log_info() print('waiting for modems to attach...') -wait(ms.is_connected, nitb.mcc_mnc()) +wait(ms.is_registered, nitb.mcc_mnc()) wait(nitb.subscriber_attached, ms) # ofono (qmi) currently changes state to 'registered' jut after sending diff --git a/sysmocom/suites/smpp/esme_ms_sms_storeforward.py b/sysmocom/suites/smpp/esme_ms_sms_storeforward.py index 232d1d3..7e7245f 100755 --- a/sysmocom/suites/smpp/esme_ms_sms_storeforward.py +++ b/sysmocom/suites/smpp/esme_ms_sms_storeforward.py @@ -32,7 +32,7 @@ mgw_bsc.start() bsc.start() bts.start() -wait(bsc.bts_is_connected, bts) +wait(bsc.bts.is_registered, bts) esme.connect() hlr.subscriber_add(ms) @@ -50,7 +50,7 @@ print('MS registers and will receive the SMS...') ms.connect(msc.mcc_mnc()) -wait(ms.is_connected, msc.mcc_mnc()) +wait(ms.is_registered, msc.mcc_mnc()) wait(msc.subscriber_attached, ms) wait(ms.sms_was_received, msg) print('Waiting to receive and consume sms receipt with reference', umref) diff --git a/sysmocom/suites/smpp/esme_ms_sms_transaction.py b/sysmocom/suites/smpp/esme_ms_sms_transaction.py index d42012b..751f5c1 100755 --- a/sysmocom/suites/smpp/esme_ms_sms_transaction.py +++ b/sysmocom/suites/smpp/esme_ms_sms_transaction.py @@ -30,7 +30,7 @@ mgw_bsc.start() bsc.start() bts.start() -wait(bsc.bts_is_connected, bts) +wait(bsc.bts.is_registered, bts) esme.connect() hlr.subscriber_add(ms) @@ -38,7 +38,7 @@ ms.log_info() print('waiting for modem to attach...') -wait(ms.is_connected, msc.mcc_mnc()) +wait(ms.is_registered, msc.mcc_mnc()) wait(msc.subscriber_attached, ms) print('sending first sms...') diff --git a/sysmocom/suites/sms/mo_mt_sms.py b/sysmocom/suites/sms/mo_mt_sms.py index 51e78c0..738a2d8 100755 --- a/sysmocom/suites/sms/mo_mt_sms.py +++ b/sysmocom/suites/sms/mo_mt_sms.py @@ -21,7 +21,7 @@ bsc.start() bts.start() -wait(bsc.bts_is_connected, bts) +wait(bsc.bts.is_registered, bts) hlr.subscriber_add(ms_mo) hlr.subscriber_add(ms_mt) @@ -33,8 +33,8 @@ ms_mt.log_info() print('waiting for modems to attach...') -wait(ms_mo.is_connected, msc.mcc_mnc()) -wait(ms_mt.is_connected, msc.mcc_mnc()) +wait(ms_mo.is_registered, msc.mcc_mnc()) +wait(ms_mt.is_registered, msc.mcc_mnc()) wait(msc.subscriber_attached, ms_mo, ms_mt) sms = ms_mo.sms_send(ms_mt) diff --git a/sysmocom/suites/ussd/assert_extension.py b/sysmocom/suites/ussd/assert_extension.py index bac311f..65272ab 100755 --- a/sysmocom/suites/ussd/assert_extension.py +++ b/sysmocom/suites/ussd/assert_extension.py @@ -22,7 +22,7 @@ bsc.start() bts.start() -wait(bsc.bts_is_connected, bts) +wait(bsc.bts.is_registered, bts) hlr.subscriber_add(ms) @@ -31,7 +31,7 @@ ms.log_info() print('waiting for modems to attach...') -wait(ms.is_connected, msc.mcc_mnc()) +wait(ms.is_registered, msc.mcc_mnc()) wait(msc.subscriber_attached, ms) # ofono (qmi) currently changes state to 'registered' jut after sending diff --git a/sysmocom/suites/voice/lib/testlib.py b/sysmocom/suites/voice/lib/testlib.py index 3ec6d67..13dcc13 100644 --- a/sysmocom/suites/voice/lib/testlib.py +++ b/sysmocom/suites/voice/lib/testlib.py @@ -33,7 +33,7 @@ bsc.start() bts.start() - wait(bsc.bts_is_connected, bts) + wait(bsc.bts.is_registered, bts) hlr.subscriber_add(ms_mo) hlr.subscriber_add(ms_mt) @@ -45,8 +45,8 @@ ms_mt.log_info() print('waiting for modems to attach...') - wait(ms_mo.is_connected, msc.mcc_mnc()) - wait(ms_mt.is_connected, msc.mcc_mnc()) + wait(ms_mo.is_registered, msc.mcc_mnc()) + wait(ms_mt.is_registered, msc.mcc_mnc()) wait(msc.subscriber_attached, ms_mo, ms_mt) assert len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ic91dddcfd1a5a17c35d15a8a14628b3923229523 Gerrit-Change-Number: 18756 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pes...@sysmocom.de> Gerrit-MessageType: newchange