<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/20667">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ms: Allocate default msisdn internally<br><br>Don't wait until adding it to the subscriber data base, since the msisdn<br>may be needed beforehand (for instance in follow up patch to be passed<br>to osmo-msc configuration to route emergency calls).<br><br>Change-Id: I0d6902687e4beb3d6cdcefd4e343f21496100504<br>---<br>M src/osmo_gsm_tester/obj/epc_amarisoft.py<br>M src/osmo_gsm_tester/obj/epc_srs.py<br>M src/osmo_gsm_tester/obj/hlr_osmo.py<br>M src/osmo_gsm_tester/obj/ms.py<br>M src/osmo_gsm_tester/obj/ms_amarisoft.py<br>M src/osmo_gsm_tester/obj/ms_ofono.py<br>M src/osmo_gsm_tester/obj/ms_osmo_mobile.py<br>M src/osmo_gsm_tester/obj/ms_srs.py<br>M src/osmo_gsm_tester/obj/nitb_osmo.py<br>9 files changed, 15 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/obj/epc_amarisoft.py b/src/osmo_gsm_tester/obj/epc_amarisoft.py</span><br><span>index 3e91b5c..1291891 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/epc_amarisoft.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/epc_amarisoft.py</span><br><span>@@ -168,8 +168,7 @@</span><br><span> </span><br><span> def subscriber_add(self, modem, msisdn=None, algo_str=None):</span><br><span> if msisdn is None:</span><br><span style="color: hsl(0, 100%, 40%);">- msisdn = self.testenv.msisdn()</span><br><span style="color: hsl(0, 100%, 40%);">- modem.set_msisdn(msisdn)</span><br><span style="color: hsl(120, 100%, 40%);">+ msisdn = modem.msisdn()</span><br><span> </span><br><span> if algo_str is None:</span><br><span> algo_str = modem.auth_algo() or util.OSMO_AUTH_ALGO_NONE</span><br><span>diff --git a/src/osmo_gsm_tester/obj/epc_srs.py b/src/osmo_gsm_tester/obj/epc_srs.py</span><br><span>index 80f66e8..b5ae0bd 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/epc_srs.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/epc_srs.py</span><br><span>@@ -183,8 +183,7 @@</span><br><span> </span><br><span> def subscriber_add(self, modem, msisdn=None, algo_str=None):</span><br><span> if msisdn is None:</span><br><span style="color: hsl(0, 100%, 40%);">- msisdn = self.testenv.msisdn()</span><br><span style="color: hsl(0, 100%, 40%);">- modem.set_msisdn(msisdn)</span><br><span style="color: hsl(120, 100%, 40%);">+ msisdn = modem.msisdn()</span><br><span> </span><br><span> if algo_str is None:</span><br><span> algo_str = modem.auth_algo() or util.OSMO_AUTH_ALGO_NONE</span><br><span>diff --git a/src/osmo_gsm_tester/obj/hlr_osmo.py b/src/osmo_gsm_tester/obj/hlr_osmo.py</span><br><span>index ecff75e..b999363 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/hlr_osmo.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/hlr_osmo.py</span><br><span>@@ -106,8 +106,7 @@</span><br><span> </span><br><span> def subscriber_add(self, modem, msisdn=None, algo_str=None):</span><br><span> if msisdn is None:</span><br><span style="color: hsl(0, 100%, 40%);">- msisdn = self.testenv.msisdn()</span><br><span style="color: hsl(0, 100%, 40%);">- modem.set_msisdn(msisdn)</span><br><span style="color: hsl(120, 100%, 40%);">+ msisdn = modem.msisdn()</span><br><span> subscriber_id = self.next_subscriber_id</span><br><span> self.next_subscriber_id += 1</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/obj/ms.py b/src/osmo_gsm_tester/obj/ms.py</span><br><span>index 417ad52..60103d7 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/ms.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/ms.py</span><br><span>@@ -42,8 +42,9 @@</span><br><span> ##############</span><br><span> # PROTECTED</span><br><span> ##############</span><br><span style="color: hsl(0, 100%, 40%);">- def __init__(self, name, conf):</span><br><span style="color: hsl(120, 100%, 40%);">+ def __init__(self, name, testenv, conf):</span><br><span> super().__init__(log.C_TST, name)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.testenv = testenv</span><br><span> self._conf = conf</span><br><span> self._msisdn = None</span><br><span> </span><br><span>@@ -114,6 +115,9 @@</span><br><span> self._msisdn = msisdn</span><br><span> </span><br><span> def msisdn(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ # If none was set, allocate next one available:</span><br><span style="color: hsl(120, 100%, 40%);">+ if self._msisdn is None:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.set_msisdn(self.testenv.msisdn())</span><br><span> return self._msisdn</span><br><span> </span><br><span> def get_counter(self, counter_name):</span><br><span>diff --git a/src/osmo_gsm_tester/obj/ms_amarisoft.py b/src/osmo_gsm_tester/obj/ms_amarisoft.py</span><br><span>index f151850..fa16d63 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/ms_amarisoft.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/ms_amarisoft.py</span><br><span>@@ -82,7 +82,7 @@</span><br><span> </span><br><span> def __init__(self, testenv, conf):</span><br><span> self._run_node = RunNode.from_conf(conf.get('run_node', {}))</span><br><span style="color: hsl(0, 100%, 40%);">- super().__init__('amarisoftue_%s' % self.addr(), conf)</span><br><span style="color: hsl(120, 100%, 40%);">+ super().__init__('amarisoftue_%s' % self.addr(), testenv, conf)</span><br><span> self.enb = None</span><br><span> self.run_dir = None</span><br><span> self.inst = None</span><br><span>@@ -98,7 +98,6 @@</span><br><span> self.remote_config_rf_file = None</span><br><span> self.remote_log_file = None</span><br><span> self.remote_ifup_file = None</span><br><span style="color: hsl(0, 100%, 40%);">- self.testenv = testenv</span><br><span> if not rf_type_valid(conf.get('rf_dev_type', None)):</span><br><span> raise log.Error('Invalid rf_dev_type=%s' % conf.get('rf_dev_type', None))</span><br><span> if conf.get('rf_dev_type') == 'zmq':</span><br><span>diff --git a/src/osmo_gsm_tester/obj/ms_ofono.py b/src/osmo_gsm_tester/obj/ms_ofono.py</span><br><span>index 0c67e0a..38fa4d4 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/ms_ofono.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/ms_ofono.py</span><br><span>@@ -373,7 +373,7 @@</span><br><span> CTX_PROT_IPv46 = 'dual'</span><br><span> </span><br><span> def __init__(self, testenv, conf):</span><br><span style="color: hsl(0, 100%, 40%);">- super().__init__('modem', conf)</span><br><span style="color: hsl(120, 100%, 40%);">+ super().__init__('modem', testenv, conf)</span><br><span> _import_external_modules()</span><br><span> self.syspath = conf.get('path')</span><br><span> self.dbuspath = get_dbuspath_from_syspath(self.syspath)</span><br><span>diff --git a/src/osmo_gsm_tester/obj/ms_osmo_mobile.py b/src/osmo_gsm_tester/obj/ms_osmo_mobile.py</span><br><span>index cc54174..11600ff 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/ms_osmo_mobile.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/ms_osmo_mobile.py</span><br><span>@@ -23,6 +23,9 @@</span><br><span> class MSOsmoMobile(ms.MS):</span><br><span> """Represent a osmocom-bb mobile."""</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def __init__(self, testenv, conf):</span><br><span style="color: hsl(120, 100%, 40%);">+ super().__init__('ms_osmo', testenv, conf)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def cleanup(self):</span><br><span> # do nothing for a virtual resource</span><br><span> pass</span><br><span>diff --git a/src/osmo_gsm_tester/obj/ms_srs.py b/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>index 0a7624a..a3505c8 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>@@ -77,7 +77,7 @@</span><br><span> </span><br><span> def __init__(self, testenv, conf):</span><br><span> self._run_node = RunNode.from_conf(conf.get('run_node', {}))</span><br><span style="color: hsl(0, 100%, 40%);">- super().__init__('srsue_%s' % self.addr(), conf)</span><br><span style="color: hsl(120, 100%, 40%);">+ super().__init__('srsue_%s' % self.addr(), testenv, conf)</span><br><span> srslte_common.__init__(self)</span><br><span> self.enb = None</span><br><span> self.run_dir = None</span><br><span>@@ -96,7 +96,6 @@</span><br><span> self.remote_metrics_file = None</span><br><span> self.enable_pcap = False</span><br><span> self.num_carriers = 1</span><br><span style="color: hsl(0, 100%, 40%);">- self.testenv = testenv</span><br><span> self._additional_args = []</span><br><span> if not rf_type_valid(conf.get('rf_dev_type', None)):</span><br><span> raise log.Error('Invalid rf_dev_type=%s' % conf.get('rf_dev_type', None))</span><br><span>diff --git a/src/osmo_gsm_tester/obj/nitb_osmo.py b/src/osmo_gsm_tester/obj/nitb_osmo.py</span><br><span>index c12648f..a424927 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/nitb_osmo.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/nitb_osmo.py</span><br><span>@@ -120,8 +120,7 @@</span><br><span> </span><br><span> def subscriber_add(self, modem, msisdn=None, algo=None):</span><br><span> if msisdn is None:</span><br><span style="color: hsl(0, 100%, 40%);">- msisdn = self.testenv.msisdn()</span><br><span style="color: hsl(0, 100%, 40%);">- modem.set_msisdn(msisdn)</span><br><span style="color: hsl(120, 100%, 40%);">+ msisdn = modem.msisdn()</span><br><span> </span><br><span> if not algo:</span><br><span> alg_str = modem.auth_algo()</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/20667">change 20667</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/c/osmo-gsm-tester/+/20667"/><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-Change-Id: I0d6902687e4beb3d6cdcefd4e343f21496100504 </div>
<div style="display:none"> Gerrit-Change-Number: 20667 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>