<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/24277">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">srs-ms: allows to run given scripts before the execution of the UE.<br><br>Executes the scripts given by the 'prerun_scripts' variable before launching the UE.<br><br>Change-Id: I718e686b5844f2f07eda820914678052f1008182<br>---<br>M src/osmo_gsm_tester/obj/ms_srs.py<br>1 file changed, 51 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><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 ec4486f..bb5d226 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>@@ -45,7 +45,8 @@</span><br><span> 'freq_offset': schema.INT,</span><br><span> 'force_ul_amplitude': schema.STR,</span><br><span> 'dl_freq': schema.STR,</span><br><span style="color: hsl(0, 100%, 40%);">- 'ul_freq': schema.STR</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ul_freq': schema.STR,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'prerun_scripts[]': schema.STR,</span><br><span> }</span><br><span> for key, val in RunNode.schema().items():</span><br><span> resource_schema['run_node.%s' % key] = val</span><br><span>@@ -171,11 +172,60 @@</span><br><span> def zmq_base_bind_port(self):</span><br><span> return self._zmq_base_bind_port</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def run_task(self, task):</span><br><span style="color: hsl(120, 100%, 40%);">+ # Get the arguments.</span><br><span style="color: hsl(120, 100%, 40%);">+ args_index = task.find('args=')</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ args = ()</span><br><span style="color: hsl(120, 100%, 40%);">+ # No arguments, all the string is the script.</span><br><span style="color: hsl(120, 100%, 40%);">+ if args_index == -1:</span><br><span style="color: hsl(120, 100%, 40%);">+ index = task.rfind('/')</span><br><span style="color: hsl(120, 100%, 40%);">+ task_name = task [index + 1:]</span><br><span style="color: hsl(120, 100%, 40%);">+ run_dir = util.Dir(self.run_dir.new_dir(task_name))</span><br><span style="color: hsl(120, 100%, 40%);">+ args = (task,)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log(f'task name is: {task_name}')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log(f'Running the script: {task} in the run dir: {run_dir}')</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ ntask = task[:args_index - 1]</span><br><span style="color: hsl(120, 100%, 40%);">+ index = ntask.rfind('/')</span><br><span style="color: hsl(120, 100%, 40%);">+ task_name = ntask [index + 1:]</span><br><span style="color: hsl(120, 100%, 40%);">+ run_dir = util.Dir(self.run_dir.new_dir(task_name))</span><br><span style="color: hsl(120, 100%, 40%);">+ args = (ntask,)</span><br><span style="color: hsl(120, 100%, 40%);">+ args += tuple(task[args_index + 5:].split(','))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log(f'task name is: {task_name}')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log(f'Running the script: {task} in the run dir: {run_dir} with args: {args}')</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ proc = process.Process(task_name, run_dir, args)</span><br><span style="color: hsl(120, 100%, 40%);">+ # Set the timeout to a high value 20 minutes.</span><br><span style="color: hsl(120, 100%, 40%);">+ proc.set_default_wait_timeout(1200)</span><br><span style="color: hsl(120, 100%, 40%);">+ returncode = proc.launch_sync()</span><br><span style="color: hsl(120, 100%, 40%);">+ if returncode != 0:</span><br><span style="color: hsl(120, 100%, 40%);">+ raise log.Error('Error executing the pre run scripts. Aborting')</span><br><span style="color: hsl(120, 100%, 40%);">+ return False</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return True</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Runs all the tasks that are intended to run before the execution of the MS.</span><br><span style="color: hsl(120, 100%, 40%);">+ def prerun_tasks(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ prerun_tasklist = self._conf.get('prerun_scripts', None)</span><br><span style="color: hsl(120, 100%, 40%);">+ if not prerun_tasklist:</span><br><span style="color: hsl(120, 100%, 40%);">+ return True</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for task in prerun_tasklist:</span><br><span style="color: hsl(120, 100%, 40%);">+ if not self.run_task(task):</span><br><span style="color: hsl(120, 100%, 40%);">+ return False</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return True</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def connect(self, enb):</span><br><span> self.log('Starting srsue')</span><br><span> self.enb = enb</span><br><span> self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name()))</span><br><span> self.configure()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if not self.prerun_tasks():</span><br><span style="color: hsl(120, 100%, 40%);">+ return</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if self._run_node.is_local():</span><br><span> self.start_locally()</span><br><span> else:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/24277">change 24277</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/+/24277"/><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: I718e686b5844f2f07eda820914678052f1008182 </div>
<div style="display:none"> Gerrit-Change-Number: 24277 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: alealcon <alejandro.leal@srs.io> </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-CC: srs_andre <andre@softwareradiosystems.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>