<p>Holger Freyther has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13041">View Change</a></p><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/resource.py<br>M src/osmo_gsm_tester/suite.py<br>M suites/nitb_netreg_mass/suite.conf<br>4 files changed, 25 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/41/13041/1</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..17d67ff 100644</span><br><span>--- a/example/resources.conf.virtual</span><br><span>+++ b/example/resources.conf.virtual</span><br><span>@@ -39,3 +39,16 @@</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%);">+mobile:</span><br><span style="color: hsl(120, 100%, 40%);">+ - imsi: "001010000000000"</span><br><span style="color: hsl(120, 100%, 40%);">+ - imsi: "001010000000001"</span><br><span style="color: hsl(120, 100%, 40%);">+ - imsi: "001010000000002"</span><br><span style="color: hsl(120, 100%, 40%);">+ - imsi: "001010000000003"</span><br><span style="color: hsl(120, 100%, 40%);">+ - imsi: "001010000000004"</span><br><span style="color: hsl(120, 100%, 40%);">+ - imsi: "001010000000005"</span><br><span style="color: hsl(120, 100%, 40%);">+ - imsi: "001010000000006"</span><br><span style="color: hsl(120, 100%, 40%);">+ - imsi: "001010000000007"</span><br><span style="color: hsl(120, 100%, 40%);">+ - imsi: "001010000000008"</span><br><span style="color: hsl(120, 100%, 40%);">+ - imsi: "001010000000009"</span><br><span style="color: hsl(120, 100%, 40%);">+ - imsi: "001010000000009"</span><br><span>diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py</span><br><span>index 4f48dc4..0185e3c 100644</span><br><span>--- a/src/osmo_gsm_tester/resource.py</span><br><span>+++ b/src/osmo_gsm_tester/resource.py</span><br><span>@@ -45,7 +45,8 @@</span><br><span> R_ARFCN = 'arfcn'</span><br><span> R_MODEM = 'modem'</span><br><span> R_OSMOCON = 'osmocon_phone'</span><br><span style="color: hsl(0, 100%, 40%);">-R_ALL = (R_IP_ADDRESS, R_BTS, R_ARFCN, R_MODEM, R_OSMOCON)</span><br><span style="color: hsl(120, 100%, 40%);">+R_MOBILE = 'mobile'</span><br><span style="color: hsl(120, 100%, 40%);">+R_ALL = (R_IP_ADDRESS, R_BTS, R_ARFCN, R_MODEM, R_OSMOCON, R_MOBILE)</span><br><span> </span><br><span> RESOURCES_SCHEMA = {</span><br><span> 'ip_address[].addr': schema.IPV4,</span><br><span>@@ -86,6 +87,7 @@</span><br><span> 'modem[].ciphers[]': schema.CIPHER,</span><br><span> 'modem[].features[]': schema.MODEM_FEATURE,</span><br><span> 'osmocon_phone[].serial_device': schema.STR,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'mobile[].imsi': schema.STR,</span><br><span> }</span><br><span> </span><br><span> WANT_SCHEMA = util.dict_add(</span><br><span>diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py</span><br><span>index e5ac9a8..71e7c04 100644</span><br><span>--- a/src/osmo_gsm_tester/suite.py</span><br><span>+++ b/src/osmo_gsm_tester/suite.py</span><br><span>@@ -17,6 +17,7 @@</span><br><span> # You should have received a copy of the GNU General Public License</span><br><span> # along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+import collections</span><br><span> import os</span><br><span> import sys</span><br><span> import time</span><br><span>@@ -25,6 +26,8 @@</span><br><span> from .event_loop import MainLoop</span><br><span> from . import osmo_nitb, osmo_hlr, osmo_mgcpgw, osmo_mgw, osmo_msc, osmo_bsc, osmo_stp, osmo_ggsn, osmo_sgsn, modem, esme, osmocon, ms_driver, iperf3</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+Mobile = collections.namedtuple("Mobile", ["imsi"])</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> class Timeout(Exception):</span><br><span> pass</span><br><span> </span><br><span>@@ -316,6 +319,10 @@</span><br><span> self.register_for_cleanup(ms)</span><br><span> return ms</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def mobile(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ mobile_cfg = self.reserved_resources.get(resource.R_MOBILE)</span><br><span style="color: hsl(120, 100%, 40%);">+ return Mobile(mobile_cfg['imsi'])</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def bts(self, specifics=None):</span><br><span> bts = bts_obj(self, self.reserved_resources.get(resource.R_BTS, specifics=specifics))</span><br><span> bts.set_lac(self.lac())</span><br><span>diff --git a/suites/nitb_netreg_mass/suite.conf b/suites/nitb_netreg_mass/suite.conf</span><br><span>index 94ec603..4b16da2 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,8 @@</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%);">+ mobile:</span><br><span style="color: hsl(120, 100%, 40%);">+ - times: 10</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: newchange </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: 1 </div>
<div style="display:none"> Gerrit-Owner: Holger Freyther <holger@freyther.de> </div>