<p>Holger Freyther <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13041">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Pau Espin Pedrol: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">resource: Add a mobile resource for the virtual test<br><br>Add a new resource and make a reservation in the suite.<br><br>Change-Id: Ic26aa63cad62323bb85f952640672eb28af0eadc<br>---<br>M example/resources.conf.virtual<br>M src/osmo_gsm_tester/ms.py<br>A src/osmo_gsm_tester/ms_osmo_mobile.py<br>M src/osmo_gsm_tester/resource.py<br>M suites/nitb_netreg_mass/suite.conf<br>5 files changed, 58 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/example/resources.conf.virtual b/example/resources.conf.virtual</span><br><span>index 44973a2..f4d8b4a 100644</span><br><span>--- a/example/resources.conf.virtual</span><br><span>+++ b/example/resources.conf.virtual</span><br><span>@@ -39,3 +39,27 @@</span><br><span> band: GSM-1900</span><br><span> - arfcn: 548</span><br><span> band: GSM-1900</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+modem:</span><br><span style="color: hsl(120, 100%, 40%);">+ - imsi: "001010000000000"</span><br><span style="color: hsl(120, 100%, 40%);">+ type: osmo-mobile</span><br><span style="color: hsl(120, 100%, 40%);">+ - imsi: "001010000000001"</span><br><span style="color: hsl(120, 100%, 40%);">+ type: osmo-mobile</span><br><span style="color: hsl(120, 100%, 40%);">+ - imsi: "001010000000002"</span><br><span style="color: hsl(120, 100%, 40%);">+ type: osmo-mobile</span><br><span style="color: hsl(120, 100%, 40%);">+ - imsi: "001010000000003"</span><br><span style="color: hsl(120, 100%, 40%);">+ type: osmo-mobile</span><br><span style="color: hsl(120, 100%, 40%);">+ - imsi: "001010000000004"</span><br><span style="color: hsl(120, 100%, 40%);">+ type: osmo-mobile</span><br><span style="color: hsl(120, 100%, 40%);">+ - imsi: "001010000000005"</span><br><span style="color: hsl(120, 100%, 40%);">+ type: osmo-mobile</span><br><span style="color: hsl(120, 100%, 40%);">+ - imsi: "001010000000006"</span><br><span style="color: hsl(120, 100%, 40%);">+ type: osmo-mobile</span><br><span style="color: hsl(120, 100%, 40%);">+ - imsi: "001010000000007"</span><br><span style="color: hsl(120, 100%, 40%);">+ type: osmo-mobile</span><br><span style="color: hsl(120, 100%, 40%);">+ - imsi: "001010000000008"</span><br><span style="color: hsl(120, 100%, 40%);">+ type: osmo-mobile</span><br><span style="color: hsl(120, 100%, 40%);">+ - imsi: "001010000000009"</span><br><span style="color: hsl(120, 100%, 40%);">+ type: osmo-mobile</span><br><span style="color: hsl(120, 100%, 40%);">+ - imsi: "001010000000009"</span><br><span style="color: hsl(120, 100%, 40%);">+ type: osmo-mobile</span><br><span>diff --git a/src/osmo_gsm_tester/ms.py b/src/osmo_gsm_tester/ms.py</span><br><span>index a361865..222a078 100644</span><br><span>--- a/src/osmo_gsm_tester/ms.py</span><br><span>+++ b/src/osmo_gsm_tester/ms.py</span><br><span>@@ -46,4 +46,4 @@</span><br><span> @abstractmethod</span><br><span> def cleanup(self):</span><br><span> """Cleans up resources allocated."""</span><br><span style="color: hsl(0, 100%, 40%);">- pass</span><br><span>\ No newline at end of file</span><br><span style="color: hsl(120, 100%, 40%);">+ pass</span><br><span>diff --git a/src/osmo_gsm_tester/ms_osmo_mobile.py b/src/osmo_gsm_tester/ms_osmo_mobile.py</span><br><span>new file mode 100644</span><br><span>index 0000000..1c28117</span><br><span>--- /dev/null</span><br><span>+++ b/src/osmo_gsm_tester/ms_osmo_mobile.py</span><br><span>@@ -0,0 +1,28 @@</span><br><span style="color: hsl(120, 100%, 40%);">+# osmo_gsm_tester: OsmocomBB based Mobile Station (MS)</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# Copyright (C) 2016-2019 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 . import ms</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%);">+class MSOsmoMobile(ms.MS):</span><br><span style="color: hsl(120, 100%, 40%);">+ """Represent a osmocom-bb mobile."""</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def cleanup(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ # do nothing for a virtual resource</span><br><span style="color: hsl(120, 100%, 40%);">+ pass</span><br><span>diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py</span><br><span>index 2e7f500..ce1966b 100644</span><br><span>--- a/src/osmo_gsm_tester/resource.py</span><br><span>+++ b/src/osmo_gsm_tester/resource.py</span><br><span>@@ -28,6 +28,7 @@</span><br><span> from . import schema</span><br><span> from . import bts_sysmo, bts_osmotrx, bts_osmovirtual, bts_octphy, bts_nanobts</span><br><span> from . import modem</span><br><span style="color: hsl(120, 100%, 40%);">+from . import ms_osmo_mobile</span><br><span> </span><br><span> from .util import is_dict, is_list</span><br><span> </span><br><span>@@ -110,6 +111,7 @@</span><br><span> # Map None to ofono for forward compability</span><br><span> None: modem.Modem,</span><br><span> 'ofono': modem.Modem,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'osmo-mobile': ms_osmo_mobile.MSOsmoMobile,</span><br><span> }</span><br><span> </span><br><span> </span><br><span>diff --git a/suites/nitb_netreg_mass/suite.conf b/suites/nitb_netreg_mass/suite.conf</span><br><span>index 94ec603..05bc054 100644</span><br><span>--- a/suites/nitb_netreg_mass/suite.conf</span><br><span>+++ b/suites/nitb_netreg_mass/suite.conf</span><br><span>@@ -3,6 +3,9 @@</span><br><span> - times: 1</span><br><span> bts:</span><br><span> - type: osmo-bts-virtual</span><br><span style="color: hsl(120, 100%, 40%);">+ modem:</span><br><span style="color: hsl(120, 100%, 40%);">+ - times: 10</span><br><span style="color: hsl(120, 100%, 40%);">+ type: osmo-mobile</span><br><span> </span><br><span> defaults:</span><br><span> timeout: 40s</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13041">change 13041</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/13041"/><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: Ic26aa63cad62323bb85f952640672eb28af0eadc </div>
<div style="display:none"> Gerrit-Change-Number: 13041 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </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>