<p>Holger Freyther has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13075">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">resource: Use a factory to initiate a modem<br><br>Change-Id: I4baa791c92196cda477b2d969d4f67dfbe1152af<br>---<br>M src/osmo_gsm_tester/resource.py<br>M src/osmo_gsm_tester/suite.py<br>2 files changed, 13 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/75/13075/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py</span><br><span>index 292bac6..b574ad4 100644</span><br><span>--- a/src/osmo_gsm_tester/resource.py</span><br><span>+++ b/src/osmo_gsm_tester/resource.py</span><br><span>@@ -107,6 +107,14 @@</span><br><span>         'nanobts': bts_nanobts.NanoBts,</span><br><span>     }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+KNOWN_MS_TYPES = {</span><br><span style="color: hsl(120, 100%, 40%);">+        # Map None to ofono for forward compability</span><br><span style="color: hsl(120, 100%, 40%);">+        None: modem.Modem,</span><br><span style="color: hsl(120, 100%, 40%);">+        'ofono': modem.Modem,</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def register_bts_type(name, clazz):</span><br><span>     KNOWN_BTS_TYPES[name] = clazz</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py</span><br><span>index e5ac9a8..7cfbf65 100644</span><br><span>--- a/src/osmo_gsm_tester/suite.py</span><br><span>+++ b/src/osmo_gsm_tester/suite.py</span><br><span>@@ -327,8 +327,12 @@</span><br><span> </span><br><span>     def modem(self, specifics=None):</span><br><span>         conf = self.reserved_resources.get(resource.R_MODEM, specifics=specifics)</span><br><span style="color: hsl(120, 100%, 40%);">+        ms_type = conf.get('type')</span><br><span style="color: hsl(120, 100%, 40%);">+        ms_class = resource.KNOWN_MS_TYPES.get(ms_type)</span><br><span style="color: hsl(120, 100%, 40%);">+        if ms_class is None:</span><br><span style="color: hsl(120, 100%, 40%);">+            raise RuntimeError('No such Modem type is defined: %r' % ms_type)</span><br><span>         self.dbg('create Modem object', conf=conf)</span><br><span style="color: hsl(0, 100%, 40%);">-        ms = modem.Modem(self, conf)</span><br><span style="color: hsl(120, 100%, 40%);">+        ms = ms_class(self, conf)</span><br><span>         self.register_for_cleanup(ms)</span><br><span>         return ms</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13075">change 13075</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/13075"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I4baa791c92196cda477b2d969d4f67dfbe1152af </div>
<div style="display:none"> Gerrit-Change-Number: 13075 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Holger Freyther <holger@freyther.de> </div>