<p>Holger Freyther has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11596">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ms_driver: Allow to specify env and binary name/path<br><br>For the proper trial/suite integration we can't assume that the<br>virtphy/mobile are in the PATH and that they can be executed<br>direcyly (e.g. need a LD_LIBRARY_PATH to be applied).<br><br>Introduce BinaryOptions to pass the name/path of the two executables<br>and the env to use. Default this to virtphy/mobile and an empty<br>environment.<br><br>Change-Id: I79a57e53bc20613ac061453c24fd29a6d05e1721<br>---<br>M src/osmo_gsm_tester/ms_driver.py<br>M src/osmo_ms_driver/__main__.py<br>M src/osmo_ms_driver/location_update_test.py<br>M src/osmo_ms_driver/starter.py<br>4 files changed, 27 insertions(+), 15 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/96/11596/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 a4d81c1..f46efa3 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>@@ -20,7 +20,7 @@</span><br><span> from osmo_ms_driver.cdf import cdfs</span><br><span> from osmo_ms_driver.event_server import EventServer</span><br><span> from osmo_ms_driver.simple_loop import SimpleLoop</span><br><span style="color: hsl(0, 100%, 40%);">-from osmo_ms_driver.location_update_test import MassUpdateLocationTest</span><br><span style="color: hsl(120, 100%, 40%);">+from osmo_ms_driver.location_update_test import BinaryOptions, MassUpdateLocationTest</span><br><span> </span><br><span> import os.path</span><br><span> import shutil</span><br><span>@@ -83,7 +83,9 @@</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%);">+ options = BinaryOptions("virtphy", "mobile", None)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._test_case = MassUpdateLocationTest("mass", options, self._num_ms, self._cdf,</span><br><span style="color: hsl(120, 100%, 40%);">+ 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/__main__.py b/src/osmo_ms_driver/__main__.py</span><br><span>index 1573084..265ce47 100644</span><br><span>--- a/src/osmo_ms_driver/__main__.py</span><br><span>+++ b/src/osmo_ms_driver/__main__.py</span><br><span>@@ -20,6 +20,7 @@</span><br><span> from .simple_loop import SimpleLoop</span><br><span> from .location_update_test import MassUpdateLocationTest</span><br><span> from .cdf import cdfs</span><br><span style="color: hsl(120, 100%, 40%);">+from .starter import BinaryOptions</span><br><span> from osmo_gsm_tester import log</span><br><span> </span><br><span> # System modules</span><br><span>@@ -82,7 +83,8 @@</span><br><span> ev_server.listen(loop)</span><br><span> </span><br><span> # Just a single test for now.</span><br><span style="color: hsl(0, 100%, 40%);">- test = MassUpdateLocationTest("lu_test", args.num_ms, cdf, ev_server, tmp_dir)</span><br><span style="color: hsl(120, 100%, 40%);">+ options = BinaryOptions("virtphy", "mobile", None)</span><br><span style="color: hsl(120, 100%, 40%);">+ test = MassUpdateLocationTest("lu_test", options, args.num_ms, cdf, ev_server, tmp_dir)</span><br><span> atexit.register(test.stop_all)</span><br><span> </span><br><span> # Run until everything has been launched</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..87b3e4e 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, name, options, 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._binary_options = options</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,12 @@</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(options.virtphy, options.env,</span><br><span style="color: hsl(120, 100%, 40%);">+ 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(options.mobile, options.env,</span><br><span style="color: hsl(120, 100%, 40%);">+ 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 5218a57..2ffb33a 100644</span><br><span>--- a/src/osmo_ms_driver/starter.py</span><br><span>+++ b/src/osmo_ms_driver/starter.py</span><br><span>@@ -18,6 +18,7 @@</span><br><span> </span><br><span> from osmo_gsm_tester import log, template</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+import collections</span><br><span> import os</span><br><span> import os.path</span><br><span> import subprocess</span><br><span>@@ -26,9 +27,13 @@</span><br><span> _devnull = open(os.devnull, 'w')</span><br><span> #_devnull = open('/dev/stdout', 'w')</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+BinaryOptions = collections.namedtuple("BinaryOptions", ["virtphy", "mobile", "env"])</span><br><span style="color: hsl(120, 100%, 40%);">+</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(120, 100%, 40%);">+ def __init__(self, binary, env, base_name, name_number, tmp_dir):</span><br><span> super().__init__(log.C_RUN, "{}/{}".format(base_name, name_number))</span><br><span style="color: hsl(120, 100%, 40%);">+ self._binary = binary</span><br><span style="color: hsl(120, 100%, 40%);">+ self._env = env</span><br><span> self._name_number = name_number</span><br><span> self._tmp_dir = tmp_dir</span><br><span> </span><br><span>@@ -36,8 +41,8 @@</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, binary, env, name_number, tmp_dir):</span><br><span style="color: hsl(120, 100%, 40%);">+ super().__init__(binary, env, "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> self._vphy_proc = None</span><br><span> </span><br><span>@@ -49,9 +54,9 @@</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> 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(120, 100%, 40%);">+ args = [self._binary, "--l1ctl-sock=" + self._phy_filename]</span><br><span> 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._vphy_proc = subprocess.Popen(args, stderr=_devnull, stdout=_devnull, env=self._env)</span><br><span> </span><br><span> def verify_ready(self):</span><br><span> while True:</span><br><span>@@ -65,8 +70,8 @@</span><br><span> 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, binary, env, 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__(binary, env, "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>@@ -117,9 +122,9 @@</span><br><span> </span><br><span> self.log("Starting process")</span><br><span> # 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(120, 100%, 40%);">+ args = [self._binary, "-c", mob_filename, "--vty-port=0"]</span><br><span> 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%);">+ self._omob_proc = subprocess.Popen(args, stderr=_devnull, stdout=_devnull, env=self._env)</span><br><span> </span><br><span> def kill(self):</span><br><span> """Clean up things."""</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11596">change 11596</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/11596"/><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: I79a57e53bc20613ac061453c24fd29a6d05e1721 </div>
<div style="display:none"> Gerrit-Change-Number: 11596 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Holger Freyther <holger@freyther.de> </div>