<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11516">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Integrate mass LU test to run fine under osmo-gsm-tester<br><br>Change-Id: I6748fce6ca25c7d4daedafe87b6b77c471d17bf9<br>---<br>M src/osmo_gsm_tester/ms_driver.py<br>M src/osmo_ms_driver/location_update_test.py<br>M src/osmo_ms_driver/starter.py<br>3 files changed, 67 insertions(+), 23 deletions(-)<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/16/11516/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/ms_driver.py b/src/osmo_gsm_tester/ms_driver.py</span><br><span>index 808989e..d23defc 100644</span><br><span>--- a/src/osmo_gsm_tester/ms_driver.py</span><br><span>+++ b/src/osmo_gsm_tester/ms_driver.py</span><br><span>@@ -62,8 +62,8 @@</span><br><span> self._test_duration = timedelta(seconds=120)</span><br><span> self._cdf = cdfs["ease_in_out"](self._time_start, self._time_step)</span><br><span> self._loop = SimpleLoop()</span><br><span style="color: hsl(0, 100%, 40%);">- self._suite_run.remember_to_stop(self)</span><br><span> self._test_case = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self.event_server_sk_tmp_dir = None</span><br><span> </span><br><span> if len(self.event_server_path().encode()) > 107:</span><br><span> raise log.Error('Path for event_server socket is longer than max allowed len for unix socket path (107):', self.event_server_path())</span><br><span>@@ -82,7 +82,7 @@</span><br><span> </span><br><span> self._ev_server = EventServer("ev_server", event_server_path)</span><br><span> self._ev_server.listen(self._loop)</span><br><span style="color: hsl(0, 100%, 40%);">- self._test_case = MassUpdateLocationTest("mass", self._num_ms, self._cdf, self._ev_server, self.event_server_sk_tmp_dir)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._test_case = MassUpdateLocationTest(self._suite_run, "mass", self._num_ms, self._cdf, self._ev_server, self.event_server_sk_tmp_dir)</span><br><span> </span><br><span> # TODO: We should pass subscribers down to the test and not get it from</span><br><span> # there.</span><br><span>diff --git a/src/osmo_ms_driver/location_update_test.py b/src/osmo_ms_driver/location_update_test.py</span><br><span>index 010c278..07f90de 100644</span><br><span>--- a/src/osmo_ms_driver/location_update_test.py</span><br><span>+++ b/src/osmo_ms_driver/location_update_test.py</span><br><span>@@ -56,8 +56,9 @@</span><br><span> TEMPLATE_LUA = "osmo-mobile-lu.lua"</span><br><span> TEMPLATE_CFG = "osmo-mobile.cfg"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def __init__(self, name, number_of_ms, cdf_function, event_server, tmp_dir):</span><br><span style="color: hsl(120, 100%, 40%);">+ def __init__(self, suite_run, name, number_of_ms, cdf_function, event_server, tmp_dir):</span><br><span> super().__init__(log.C_RUN, name)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._suite_run = suite_run</span><br><span> self._number_of_ms = number_of_ms</span><br><span> self._cdf = cdf_function</span><br><span> self._cdf.set_target(number_of_ms)</span><br><span>@@ -71,10 +72,10 @@</span><br><span> for i in range(0, number_of_ms):</span><br><span> ms_name = "%.5d" % i</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- phy = OsmoVirtPhy(ms_name, tmp_dir)</span><br><span style="color: hsl(120, 100%, 40%);">+ phy = OsmoVirtPhy(self._suite_run, ms_name, tmp_dir)</span><br><span> self._phys.append(phy)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- launcher = OsmoMobile(ms_name, tmp_dir, self.TEMPLATE_LUA,</span><br><span style="color: hsl(120, 100%, 40%);">+ launcher = OsmoMobile(self._suite_run, ms_name, tmp_dir, self.TEMPLATE_LUA,</span><br><span> self.TEMPLATE_CFG, imsi_gen,</span><br><span> phy.phy_filename(),</span><br><span> event_server.server_path())</span><br><span>diff --git a/src/osmo_ms_driver/starter.py b/src/osmo_ms_driver/starter.py</span><br><span>index 86ad446..5790df3 100644</span><br><span>--- a/src/osmo_ms_driver/starter.py</span><br><span>+++ b/src/osmo_ms_driver/starter.py</span><br><span>@@ -16,7 +16,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(0, 100%, 40%);">-from osmo_gsm_tester import log, template</span><br><span style="color: hsl(120, 100%, 40%);">+from osmo_gsm_tester import log, template, process, util</span><br><span> </span><br><span> import os</span><br><span> import os.path</span><br><span>@@ -27,18 +27,20 @@</span><br><span> #_devnull = open('/dev/stdout', 'w')</span><br><span> </span><br><span> class Launcher(log.Origin):</span><br><span style="color: hsl(0, 100%, 40%);">- def __init__(self, base_name, name_number, tmp_dir):</span><br><span style="color: hsl(0, 100%, 40%);">- super().__init__(log.C_RUN, "{}/{}".format(base_name, name_number))</span><br><span style="color: hsl(120, 100%, 40%);">+ def __init__(self, suite_run, base_name, name_number, tmp_dir):</span><br><span style="color: hsl(120, 100%, 40%);">+ super().__init__(log.C_RUN, "{}_{}".format(base_name, name_number))</span><br><span> self._name_number = name_number</span><br><span> self._tmp_dir = tmp_dir</span><br><span style="color: hsl(120, 100%, 40%);">+ self.suite_run = suite_run</span><br><span> </span><br><span> def name_number(self):</span><br><span> return self._name_number</span><br><span> </span><br><span> class OsmoVirtPhy(Launcher):</span><br><span style="color: hsl(0, 100%, 40%);">- def __init__(self, name_number, tmp_dir):</span><br><span style="color: hsl(0, 100%, 40%);">- super().__init__("osmo-ms-virt-phy", name_number, tmp_dir)</span><br><span style="color: hsl(120, 100%, 40%);">+ def __init__(self, suite_run, name_number, tmp_dir):</span><br><span style="color: hsl(120, 100%, 40%);">+ super().__init__(suite_run, "osmo-ms-virt-phy", name_number, tmp_dir)</span><br><span> self._phy_filename = os.path.join(self._tmp_dir, "osmocom_l2_" + self._name_number)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._vphy_proc = None</span><br><span> </span><br><span> def phy_filename(self):</span><br><span> return self._phy_filename</span><br><span>@@ -47,10 +49,30 @@</span><br><span> if len(self._phy_filename.encode()) > 107:</span><br><span> raise log.Error('Path for unix socket is longer than max allowed len for unix socket path (107):', self._phy_filename)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- self.log("Starting virtphy process")</span><br><span style="color: hsl(0, 100%, 40%);">- args = ["virtphy", "--l1ctl-sock=" + self._phy_filename]</span><br><span style="color: hsl(0, 100%, 40%);">- self.log(' '.join(args))</span><br><span style="color: hsl(0, 100%, 40%);">- self._vphy_proc = subprocess.Popen(args, stderr=_devnull, stdout=_devnull)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log('Starting virtphy')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmocom-bb')))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ binary = inst.child('bin', 'virtphy')</span><br><span style="color: hsl(120, 100%, 40%);">+ if not os.path.isfile(binary):</span><br><span style="color: hsl(120, 100%, 40%);">+ raise RuntimeError('Binary missing: %r' % binary)</span><br><span style="color: hsl(120, 100%, 40%);">+ lib = inst.child('lib')</span><br><span style="color: hsl(120, 100%, 40%);">+ if not os.path.isdir(lib):</span><br><span style="color: hsl(120, 100%, 40%);">+ raise RuntimeError('No lib/ in %r' % inst)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ #pcap_recorder.PcapRecorder(self.suite_run, self.run_dir.new_dir('pcap'), None,</span><br><span style="color: hsl(120, 100%, 40%);">+ # 'host %s and port not 22' % self.addr())</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ self.dbg(run_dir=self.run_dir, binary=binary, env=env)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._vphy_proc = process.Process(self.name(), self.run_dir,</span><br><span style="color: hsl(120, 100%, 40%);">+ (binary, "--l1ctl-sock=" + self._phy_filename),</span><br><span style="color: hsl(120, 100%, 40%);">+ env=env)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.suite_run.remember_to_stop(self._vphy_proc)</span><br><span style="color: hsl(120, 100%, 40%);">+ # TODO: Add some way to set Process stderr and stdout to NULL</span><br><span style="color: hsl(120, 100%, 40%);">+ self._vphy_proc.launch()</span><br><span> </span><br><span> def verify_ready(self):</span><br><span> while True:</span><br><span>@@ -61,17 +83,18 @@</span><br><span> def kill(self):</span><br><span> """Clean up things."""</span><br><span> if self._vphy_proc:</span><br><span style="color: hsl(0, 100%, 40%);">- self._vphy_proc.kill()</span><br><span style="color: hsl(120, 100%, 40%);">+ self._vphy_proc.terminate()</span><br><span> </span><br><span> class OsmoMobile(Launcher):</span><br><span style="color: hsl(0, 100%, 40%);">- def __init__(self, name_number, tmp_dir, lua_tmpl, cfg_tmpl, imsi_ki_generator, phy_filename, ev_server_path):</span><br><span style="color: hsl(0, 100%, 40%);">- super().__init__("osmo-ms-mob", name_number, tmp_dir)</span><br><span style="color: hsl(120, 100%, 40%);">+ def __init__(self, suite_run, name_number, tmp_dir, lua_tmpl, cfg_tmpl, imsi_ki_generator, phy_filename, ev_server_path):</span><br><span style="color: hsl(120, 100%, 40%);">+ super().__init__(suite_run, "osmo-ms-mob", name_number, tmp_dir)</span><br><span> self._lua_template = lua_tmpl</span><br><span> self._cfg_template = cfg_tmpl</span><br><span> self._imsi_ki_generator = imsi_ki_generator</span><br><span> self._phy_filename = phy_filename</span><br><span> self._ev_server_path = ev_server_path</span><br><span> self._imsi, self._ki = next(self._imsi_ki_generator)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._omob_proc = None</span><br><span> </span><br><span> def imsi(self):</span><br><span> return self._imsi</span><br><span>@@ -113,13 +136,33 @@</span><br><span> lua_filename = self.write_lua_cfg()</span><br><span> mob_filename = self.write_mob_cfg(lua_filename, self._phy_filename)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- self.log("Starting process")</span><br><span style="color: hsl(0, 100%, 40%);">- # Let the kernel pick an unused port for the VTY.</span><br><span style="color: hsl(0, 100%, 40%);">- args = ["mobile", "-c", mob_filename, "--vty-port=0"]</span><br><span style="color: hsl(0, 100%, 40%);">- self.log(' '.join(args))</span><br><span style="color: hsl(0, 100%, 40%);">- self._omob_proc = subprocess.Popen(args, stderr=_devnull, stdout=_devnull)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log('Starting mobile')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmocom-bb')))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ binary = inst.child('bin', 'mobile')</span><br><span style="color: hsl(120, 100%, 40%);">+ if not os.path.isfile(binary):</span><br><span style="color: hsl(120, 100%, 40%);">+ raise RuntimeError('Binary missing: %r' % binary)</span><br><span style="color: hsl(120, 100%, 40%);">+ lib = inst.child('lib')</span><br><span style="color: hsl(120, 100%, 40%);">+ if not os.path.isdir(lib):</span><br><span style="color: hsl(120, 100%, 40%);">+ raise RuntimeError('No lib/ in %r' % inst)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ #pcap_recorder.PcapRecorder(self.suite_run, self.run_dir.new_dir('pcap'), None,</span><br><span style="color: hsl(120, 100%, 40%);">+ # 'host %s and port not 22' % self.addr())</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ self.dbg(run_dir=self.run_dir, binary=binary, env=env)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._omob_proc = process.Process(self.name(), self.run_dir,</span><br><span style="color: hsl(120, 100%, 40%);">+ (binary, "-c", mob_filename, "--vty-port=0"),</span><br><span style="color: hsl(120, 100%, 40%);">+ env=env)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.suite_run.remember_to_stop(self._omob_proc)</span><br><span style="color: hsl(120, 100%, 40%);">+ # TODO: Add some way to set Process stderr and stdout to NULL</span><br><span style="color: hsl(120, 100%, 40%);">+ self._omob_proc.launch()</span><br><span> </span><br><span> def kill(self):</span><br><span> """Clean up things."""</span><br><span> if self._omob_proc:</span><br><span style="color: hsl(0, 100%, 40%);">- self._omob_proc.kill()</span><br><span style="color: hsl(120, 100%, 40%);">+ self._omob_proc.terminate()</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11516">change 11516</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/11516"/><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: I6748fce6ca25c7d4daedafe87b6b77c471d17bf9 </div>
<div style="display:none"> Gerrit-Change-Number: 11516 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>