tests: Replace is_connected() with is_registered()
API was renamed and old name deprecated, let's use it everywhere. Change-Id: Ic91dddcfd1a5a17c35d15a8a14628b3923229523
This commit is contained in:
parent
ffa325ede0
commit
3a81a7e4dc
|
@ -33,8 +33,8 @@ ms_mo.log_info()
|
|||
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)
|
||||
|
|
|
@ -26,7 +26,7 @@ iperf3srv.start()
|
|||
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()))
|
||||
|
|
|
@ -26,7 +26,7 @@ iperf3srv.start()
|
|||
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()))
|
||||
|
|
|
@ -16,7 +16,7 @@ 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()))
|
||||
|
|
|
@ -519,10 +519,6 @@ class Modem(MS):
|
|||
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 @@ class Modem(MS):
|
|||
# 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 @@ class Modem(MS):
|
|||
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')
|
||||
|
|
|
@ -54,7 +54,7 @@ while True:
|
|||
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.')
|
||||
|
|
|
@ -76,8 +76,8 @@ ms_mo.log_info()
|
|||
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)
|
||||
|
||||
|
|
|
@ -39,7 +39,7 @@ def encryption_test_setup_run(enable_auth, algo):
|
|||
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 @@ def encryption_test_setup_run(enable_auth, algo):
|
|||
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)
|
||||
|
|
|
@ -85,7 +85,7 @@ def setup_run_iperf3_test_parallel(num_ms, ready_cb=None):
|
|||
|
||||
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...')
|
||||
|
|
|
@ -40,7 +40,7 @@ ms.attach()
|
|||
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...')
|
||||
|
|
|
@ -45,7 +45,7 @@ ms.attach()
|
|||
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...')
|
||||
|
|
|
@ -31,7 +31,7 @@ while True:
|
|||
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.')
|
||||
|
|
|
@ -18,5 +18,5 @@ ms.connect(nitb.mcc_mnc())
|
|||
|
||||
print(ms.info())
|
||||
|
||||
wait(ms.is_connected, nitb.mcc_mnc())
|
||||
wait(ms.is_registered, nitb.mcc_mnc())
|
||||
wait(nitb.subscriber_attached, ms)
|
||||
|
|
|
@ -18,5 +18,5 @@ ms.connect()
|
|||
|
||||
print(ms.info())
|
||||
|
||||
wait(ms.is_connected)
|
||||
wait(ms.is_registered)
|
||||
wait(nitb.subscriber_attached, ms)
|
||||
|
|
|
@ -38,7 +38,7 @@ umref = esme.sms_send_wait_resp(msg, esme.MSGMODE_STOREFORWARD, receipt=True)
|
|||
|
||||
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)
|
||||
|
|
|
@ -28,7 +28,7 @@ ms.connect(nitb.mcc_mnc())
|
|||
|
||||
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...')
|
||||
|
|
|
@ -22,8 +22,8 @@ ms_mo.log_info()
|
|||
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)
|
||||
|
|
|
@ -19,7 +19,7 @@ ms.connect(nitb.mcc_mnc())
|
|||
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
|
||||
|
|
|
@ -50,7 +50,7 @@ umref = esme.sms_send_wait_resp(msg, esme.MSGMODE_STOREFORWARD, receipt=True)
|
|||
|
||||
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)
|
||||
|
|
|
@ -38,7 +38,7 @@ ms.connect(msc.mcc_mnc())
|
|||
|
||||
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...')
|
||||
|
|
|
@ -33,8 +33,8 @@ ms_mo.log_info()
|
|||
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)
|
||||
|
|
|
@ -31,7 +31,7 @@ ms.connect(msc.mcc_mnc())
|
|||
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
|
||||
|
|
|
@ -45,8 +45,8 @@ def test_mo_mt_call(use_osmux=False, force_osmux=False):
|
|||
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
|
||||
|
|
Loading…
Reference in New Issue