Pau Espin Pedrol has submitted this change and it was merged.
Change subject: modem: Move power off sequence to separate method
......................................................................
modem: Move power off sequence to separate method
Also make sure we power off the modem during cleanup, to make sure we
set it offline (and in the future, we also detach GPRS).
Change-Id: I47845f36864d494be474fdd447a4e9e0cbed1abd
---
M src/osmo_gsm_tester/modem.py
1 file changed, 10 insertions(+), 4 deletions(-)
Approvals:
Neels Hofmeyr: Looks good to me, approved
Harald Welte: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/osmo_gsm_tester/modem.py b/src/osmo_gsm_tester/modem.py
index e73ae4e..0796fa6 100644
--- a/src/osmo_gsm_tester/modem.py
+++ b/src/osmo_gsm_tester/modem.py
@@ -358,6 +358,8 @@
if self.cancellable:
self.cancel_pending_dbus_methods()
self.cancellable = None
+ if self.is_powered():
+ self.power_off()
self.dbus.cleanup()
self.dbus = None
@@ -528,15 +530,19 @@
# once it has been triggered, create a new one for next operation:
self.cancellable = Gio.Cancellable.new()
+ def power_off(self):
+ self.set_online(False)
+ self.set_powered(False)
+ req_ifaces = self._required_ifaces()
+ for iface in req_ifaces:
+ event_loop.wait(self, lambda: not self.dbus.has_interface(iface),
timeout=10)
+
def power_cycle(self):
'Power the modem and put it online, power cycle it if it was already
on'
req_ifaces = self._required_ifaces()
if self.is_powered():
self.dbg('Power cycling')
- self.set_online(False)
- self.set_powered(False)
- for iface in req_ifaces:
- event_loop.wait(self, lambda: not
self.dbus.has_interface(iface), timeout=10)
+ self.power_off()
else:
self.dbg('Powering on')
self.set_powered()
--
To view, visit https://gerrit.osmocom.org/4998
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I47845f36864d494be474fdd447a4e9e0cbed1abd
Gerrit-PatchSet: 1
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol <[email protected]>
Gerrit-Reviewer: Harald Welte <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr <[email protected]>
Gerrit-Reviewer: Pau Espin Pedrol <[email protected]>
