<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17474">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo_ms_driver: Store cfg files and logs in correct test rundir<br><br>This way all the content is available as an artifact when we run it<br>inside osmo-gsm-tester.<br><br>Change-Id: I3ab493e6aafef90bb0c5d98e552840fd11c43079<br>---<br>M src/osmo_ms_driver/starter.py<br>1 file changed, 12 insertions(+), 7 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/74/17474/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_ms_driver/starter.py b/src/osmo_ms_driver/starter.py</span><br><span>index 2ae423d..8757e40 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, process, template</span><br><span style="color: hsl(120, 100%, 40%);">+from osmo_gsm_tester import log, util, process, template</span><br><span> </span><br><span> from .test_support import ResultStore</span><br><span> </span><br><span>@@ -38,6 +38,7 @@</span><br><span> self._env = env</span><br><span> self._name_number = name_number</span><br><span> self._tmp_dir = tmp_dir.new_dir(self.name())</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = self._tmp_dir</span><br><span> </span><br><span> def name_number(self):</span><br><span> return self._name_number</span><br><span>@@ -52,14 +53,16 @@</span><br><span> return self._phy_filename</span><br><span> </span><br><span> def start(self, loop, suite_run=None):</span><br><span style="color: hsl(120, 100%, 40%);">+ if suite_run is not None: # overwrite run_dir to store files if run from inside osmo-gsm-tester:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(suite_run.get_test_run_dir().new_dir(self.name()))</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> self.log("Starting virtphy")</span><br><span> args = [self._binary, "--l1ctl-sock=" + self._phy_filename]</span><br><span style="color: hsl(0, 100%, 40%);">- self._vphy_proc = process.Process(self.name(), self._tmp_dir,</span><br><span style="color: hsl(120, 100%, 40%);">+ self._vphy_proc = process.Process(self.name(), self.run_dir,</span><br><span> args, env=self._env)</span><br><span style="color: hsl(0, 100%, 40%);">- if suite_run:</span><br><span style="color: hsl(120, 100%, 40%);">+ if suite_run is not None:</span><br><span> suite_run.remember_to_stop(self._vphy_proc)</span><br><span> self._vphy_proc.launch()</span><br><span> </span><br><span>@@ -109,7 +112,7 @@</span><br><span> self._cfg['test'][key] = value</span><br><span> </span><br><span> def write_lua_cfg(self):</span><br><span style="color: hsl(0, 100%, 40%);">- lua_cfg_file = os.path.join(self._tmp_dir, "lua_" + self._name_number + ".lua")</span><br><span style="color: hsl(120, 100%, 40%);">+ lua_cfg_file = self.run_dir.new_file("lua_" + self._name_number + ".lua")</span><br><span> lua_script = template.render(self._lua_template, self._cfg)</span><br><span> with open(lua_cfg_file, 'w') as w:</span><br><span> w.write(lua_script)</span><br><span>@@ -125,22 +128,24 @@</span><br><span> 'ms_number': self._name_number,</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- mob_cfg_file = os.path.join(self._tmp_dir, "mob_" + self._name_number + ".cfg")</span><br><span style="color: hsl(120, 100%, 40%);">+ mob_cfg_file = self.run_dir.new_file("mob_" + self._name_number + ".cfg")</span><br><span> mob_vty = template.render(self._cfg_template, cfg)</span><br><span> with open(mob_cfg_file, 'w') as w:</span><br><span> w.write(mob_vty)</span><br><span> return mob_cfg_file</span><br><span> </span><br><span> def start(self, loop, suite_run=None):</span><br><span style="color: hsl(120, 100%, 40%);">+ if suite_run is not None: # overwrite run_dir to store files if run from inside osmo-gsm-tester:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(suite_run.get_test_run_dir().new_dir(self.name()))</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> self.log("Starting mobile")</span><br><span> # Let the kernel pick an unused port for the VTY.</span><br><span> args = [self._binary, "-c", mob_filename]</span><br><span style="color: hsl(0, 100%, 40%);">- self._omob_proc = process.Process(self.name(), self._tmp_dir,</span><br><span style="color: hsl(120, 100%, 40%);">+ self._omob_proc = process.Process(self.name(), self.run_dir,</span><br><span> args, env=self._env)</span><br><span style="color: hsl(0, 100%, 40%);">- if suite_run:</span><br><span style="color: hsl(120, 100%, 40%);">+ if suite_run is not None:</span><br><span> suite_run.remember_to_stop(self._omob_proc)</span><br><span> self._omob_proc.launch()</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17474">change 17474</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/+/17474"/><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: I3ab493e6aafef90bb0c5d98e552840fd11c43079 </div>
<div style="display:none"> Gerrit-Change-Number: 17474 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>