<p>Holger Freyther <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13076">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Pau Espin Pedrol: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">resource: Introduce a base class for the modem<br><br>Extract IMSI, KI and authentication algorithm into a base class.<br><br>Change-Id: Id547cdcc241a307a2ea59b5fbac6b8d7a9d95639<br>---<br>M src/osmo_gsm_tester/modem.py<br>A src/osmo_gsm_tester/ms.py<br>2 files changed, 56 insertions(+), 16 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/modem.py b/src/osmo_gsm_tester/modem.py</span><br><span>index 95ebb6b..e7ce68a 100644</span><br><span>--- a/src/osmo_gsm_tester/modem.py</span><br><span>+++ b/src/osmo_gsm_tester/modem.py</span><br><span>@@ -19,6 +19,7 @@</span><br><span> </span><br><span> from . import log, util, sms, process</span><br><span> from .event_loop import MainLoop</span><br><span style="color: hsl(120, 100%, 40%);">+from .ms import MS</span><br><span> </span><br><span> from pydbus import SystemBus, Variant</span><br><span> import os</span><br><span>@@ -318,8 +319,7 @@</span><br><span> return self.property_is('Online', True)</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-class Modem(log.Origin):</span><br><span style="color: hsl(120, 100%, 40%);">+class Modem(MS):</span><br><span> 'convenience for ofono Modem interaction'</span><br><span> </span><br><span> CTX_PROT_IPv4 = 'ip'</span><br><span>@@ -327,16 +327,13 @@</span><br><span> CTX_PROT_IPv46 = 'dual'</span><br><span> </span><br><span> def __init__(self, suite_run, conf):</span><br><span style="color: hsl(0, 100%, 40%);">- self.suite_run = suite_run</span><br><span style="color: hsl(0, 100%, 40%);">- self.conf = conf</span><br><span> self.syspath = conf.get('path')</span><br><span> self.dbuspath = get_dbuspath_from_syspath(self.syspath)</span><br><span style="color: hsl(0, 100%, 40%);">- super().__init__(log.C_TST, self.dbuspath)</span><br><span style="color: hsl(120, 100%, 40%);">+ super().__init__(self.dbuspath, conf)</span><br><span> self.dbg('creating from syspath %s' % self.syspath)</span><br><span style="color: hsl(0, 100%, 40%);">- self.msisdn = None</span><br><span> self._ki = None</span><br><span> self._imsi = None</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name().strip('/')))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(suite_run.get_test_run_dir().new_dir(self.name().strip('/')))</span><br><span> self.sms_received_list = []</span><br><span> self.dbus = ModemDbusInteraction(self.dbuspath)</span><br><span> self.register_attempts = 0</span><br><span>@@ -406,9 +403,6 @@</span><br><span> def is_online(self):</span><br><span> return self.dbus.is_online()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def set_msisdn(self, msisdn):</span><br><span style="color: hsl(0, 100%, 40%);">- self.msisdn = msisdn</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> def imsi(self):</span><br><span> if self._imsi is None:</span><br><span> if 'sim' in self.features():</span><br><span>@@ -423,7 +417,7 @@</span><br><span> self.dbg('got SIM properties', props)</span><br><span> self._imsi = props.get('SubscriberIdentity', None)</span><br><span> else:</span><br><span style="color: hsl(0, 100%, 40%);">- self._imsi = self.conf.get('imsi')</span><br><span style="color: hsl(120, 100%, 40%);">+ self._imsi = super().imsi()</span><br><span> if self._imsi is None:</span><br><span> raise log.Error('No IMSI')</span><br><span> return self._imsi</span><br><span>@@ -434,13 +428,10 @@</span><br><span> def ki(self):</span><br><span> if self._ki is not None:</span><br><span> return self._ki</span><br><span style="color: hsl(0, 100%, 40%);">- return self.conf.get('ki')</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- def auth_algo(self):</span><br><span style="color: hsl(0, 100%, 40%);">- return self.conf.get('auth_algo', None)</span><br><span style="color: hsl(120, 100%, 40%);">+ return super().ki()</span><br><span> </span><br><span> def features(self):</span><br><span style="color: hsl(0, 100%, 40%);">- return self.conf.get('features', [])</span><br><span style="color: hsl(120, 100%, 40%);">+ return self._conf.get('features', [])</span><br><span> </span><br><span> def _required_ifaces(self):</span><br><span> req_ifaces = (I_NETREG,)</span><br><span>diff --git a/src/osmo_gsm_tester/ms.py b/src/osmo_gsm_tester/ms.py</span><br><span>new file mode 100644</span><br><span>index 0000000..a361865</span><br><span>--- /dev/null</span><br><span>+++ b/src/osmo_gsm_tester/ms.py</span><br><span>@@ -0,0 +1,49 @@</span><br><span style="color: hsl(120, 100%, 40%);">+# osmo_gsm_tester: Base class for Mobile Stations (MS)</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# Copyright (C) 2016-2017 by sysmocom - s.f.m.c. GmbH</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# Author: Neels Hofmeyr <neels@hofmeyr.de></span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# This program is free software: you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+# it under the terms of the GNU General Public License as</span><br><span style="color: hsl(120, 100%, 40%);">+# published by the Free Software Foundation, either version 3 of the</span><br><span style="color: hsl(120, 100%, 40%);">+# License, or (at your option) any later version.</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+# but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+# GNU General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# You should have received a copy of the GNU General Public License</span><br><span style="color: hsl(120, 100%, 40%);">+# along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+from abc import ABCMeta, abstractmethod</span><br><span style="color: hsl(120, 100%, 40%);">+from . import log</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+class MS(log.Origin, metaclass=ABCMeta):</span><br><span style="color: hsl(120, 100%, 40%);">+ """Base for everything about mobile/modem and SIMs."""</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def __init__(self, name, conf):</span><br><span style="color: hsl(120, 100%, 40%);">+ super().__init__(log.C_TST, name)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._conf = conf</span><br><span style="color: hsl(120, 100%, 40%);">+ self.msisdn = None</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def imsi(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ return self._conf.get('imsi')</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def ki(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ return self._conf.get('ki')</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def auth_algo(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ return self._conf.get('auth_algo', None)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def set_msisdn(self, msisdn):</span><br><span style="color: hsl(120, 100%, 40%);">+ self.msisdn = msisdn</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def msisdn(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ return self.msisdn</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ @abstractmethod</span><br><span style="color: hsl(120, 100%, 40%);">+ def cleanup(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ """Cleans up resources allocated."""</span><br><span style="color: hsl(120, 100%, 40%);">+ pass</span><br><span>\ No newline at end of file</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13076">change 13076</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/13076"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Id547cdcc241a307a2ea59b5fbac6b8d7a9d95639 </div>
<div style="display:none"> Gerrit-Change-Number: 13076 </div>
<div style="display:none"> Gerrit-PatchSet: 7 </div>
<div style="display:none"> Gerrit-Owner: Holger Freyther <holger@freyther.de> </div>
<div style="display:none"> Gerrit-Reviewer: Holger Freyther <holger@freyther.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>