<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13827">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Pau Espin Pedrol: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">virtual: Make mass tests be able to activate themselves<br><br>We will need to enable/disable generation of lua script code<br>depending on the subscriber and mass test.<br><br>Change-Id: Ide4d788543d910356efe9f61e789b3975f7bc558<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>M src/osmo_ms_driver/test_support.py<br>5 files changed, 42 insertions(+), 18 deletions(-)<br><br></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 0b2bd98..f1334fc 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>@@ -122,7 +122,8 @@</span><br><span> for sub in self._subscribers:</span><br><span> self._starter.subscriber_add(sub)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- self._executor.configure(len(self._subscribers))</span><br><span style="color: hsl(120, 100%, 40%);">+ self._starter.configure_tasks()</span><br><span style="color: hsl(120, 100%, 40%);">+ self._executor.configure(self._subscribers, self._starter.mobiles())</span><br><span> self._configured = True</span><br><span> </span><br><span> def run_test(self):</span><br><span>diff --git a/src/osmo_ms_driver/__main__.py b/src/osmo_ms_driver/__main__.py</span><br><span>index c3da49d..a752c37 100644</span><br><span>--- a/src/osmo_ms_driver/__main__.py</span><br><span>+++ b/src/osmo_ms_driver/__main__.py</span><br><span>@@ -98,8 +98,10 @@</span><br><span> 'imsi': imsi,</span><br><span> 'ki': ki,</span><br><span> 'auth_algo': 'comp128v1',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'run_lu_test': False,</span><br><span> }</span><br><span> starter.subscriber_add(ms_osmo_mobile.MSOsmoMobile("ms_%d" % i, conf))</span><br><span style="color: hsl(120, 100%, 40%);">+ starter.configure_tasks()</span><br><span> test.configure(args.num_ms)</span><br><span> </span><br><span> atexit.register(starter.stop_all)</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 1a33f09..d0d572d 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>@@ -60,9 +60,13 @@</span><br><span> super().__init__(name, event_server, results)</span><br><span> self._event_server.register(self.handle_msg)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def configure(self, num_subscribers):</span><br><span style="color: hsl(0, 100%, 40%);">- self._num_subscribers = num_subscribers</span><br><span style="color: hsl(0, 100%, 40%);">- self._outstanding = num_subscribers</span><br><span style="color: hsl(120, 100%, 40%);">+ def configure(self, subscribers, mobiles):</span><br><span style="color: hsl(120, 100%, 40%);">+ # Enable the LU test script in each mobile</span><br><span style="color: hsl(120, 100%, 40%);">+ for mobile in mobiles:</span><br><span style="color: hsl(120, 100%, 40%);">+ mobile.set_cfg_item('run_lu_test', True)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ self._num_subscribers = len(subscribers)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._outstanding = self._num_subscribers</span><br><span> </span><br><span> def handle_msg(self, _data, addr, time):</span><br><span> data = json.loads(_data.decode())</span><br><span>diff --git a/src/osmo_ms_driver/starter.py b/src/osmo_ms_driver/starter.py</span><br><span>index 61d3bb0..2ae423d 100644</span><br><span>--- a/src/osmo_ms_driver/starter.py</span><br><span>+++ b/src/osmo_ms_driver/starter.py</span><br><span>@@ -85,23 +85,32 @@</span><br><span> self._ki = subscriber.ki()</span><br><span> self._omob_proc = None</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ lua_support = os.path.join(os.path.dirname(__file__), 'lua')</span><br><span style="color: hsl(120, 100%, 40%);">+ self._cfg = {</span><br><span style="color: hsl(120, 100%, 40%);">+ 'test': {</span><br><span style="color: hsl(120, 100%, 40%);">+ 'event_path': self._ev_server_path,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'lua_support': lua_support,</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def imsi(self):</span><br><span> return self._imsi</span><br><span> </span><br><span> def ki(self):</span><br><span> return self._ki</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def set_cfg_item(self, key, value):</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ Sets `key` to `value` inside the test dictionary.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ Used by testcases to pass per MS settings into the lua script</span><br><span style="color: hsl(120, 100%, 40%);">+ generator.</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ self._cfg['test'][key] = value</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def write_lua_cfg(self):</span><br><span style="color: hsl(0, 100%, 40%);">- lua_support = os.path.join(os.path.dirname(__file__), 'lua')</span><br><span style="color: hsl(0, 100%, 40%);">- cfg = {</span><br><span style="color: hsl(0, 100%, 40%);">- 'test': {</span><br><span style="color: hsl(0, 100%, 40%);">- 'event_path': self._ev_server_path,</span><br><span style="color: hsl(0, 100%, 40%);">- 'lua_support': lua_support,</span><br><span style="color: hsl(0, 100%, 40%);">- 'run_lu_test': True,</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> lua_cfg_file = os.path.join(self._tmp_dir, "lua_" + self._name_number + ".lua")</span><br><span style="color: hsl(0, 100%, 40%);">- lua_script = template.render(self._lua_template, cfg)</span><br><span style="color: hsl(120, 100%, 40%);">+ 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> return lua_cfg_file</span><br><span>@@ -220,7 +229,6 @@</span><br><span> def prepare(self, loop):</span><br><span> self.log("Starting testcase")</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- self.configure_tasks()</span><br><span> self.pre_launch(loop)</span><br><span> </span><br><span> self._start_time = time.clock_gettime(time.CLOCK_MONOTONIC)</span><br><span>@@ -296,3 +304,7 @@</span><br><span> ms.set_start_time(time)</span><br><span> launch_delay = ms.start_time() - ms.launch_time()</span><br><span> self.log("MS start registered ", ms=ms, at=time, delay=launch_delay)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def mobiles(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ """Returns the list of mobiles configured."""</span><br><span style="color: hsl(120, 100%, 40%);">+ return self._mobiles</span><br><span>diff --git a/src/osmo_ms_driver/test_support.py b/src/osmo_ms_driver/test_support.py</span><br><span>index f7910dd..ce3f5f1 100644</span><br><span>--- a/src/osmo_ms_driver/test_support.py</span><br><span>+++ b/src/osmo_ms_driver/test_support.py</span><br><span>@@ -76,8 +76,13 @@</span><br><span> self._event_server = event_server</span><br><span> self._results = results</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def configure(self, num_subscribers):</span><br><span style="color: hsl(0, 100%, 40%);">- """Configures the test given the (number) of subscribers."""</span><br><span style="color: hsl(120, 100%, 40%);">+ def configure(self, subscribers, mobiles):</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ Configures the test given the subscribers.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ The subscriber at index _i_ belongs to the mobile at the</span><br><span style="color: hsl(120, 100%, 40%);">+ same index. subscribers[i] == mobiles[i].subscriber().</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span> pass</span><br><span> </span><br><span> def before_start(self):</span><br><span>@@ -107,9 +112,9 @@</span><br><span> def add_test(self, test):</span><br><span> self._tests.append(test)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def configure(self, num_subscriber):</span><br><span style="color: hsl(120, 100%, 40%);">+ def configure(self, subscribers, mobiles):</span><br><span> for test in self._tests:</span><br><span style="color: hsl(0, 100%, 40%);">- test.configure(num_subscriber)</span><br><span style="color: hsl(120, 100%, 40%);">+ test.configure(subscribers, mobiles)</span><br><span> </span><br><span> def before_start(self):</span><br><span> for test in self._tests:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13827">change 13827</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/13827"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ide4d788543d910356efe9f61e789b3975f7bc558 </div>
<div style="display:none"> Gerrit-Change-Number: 13827 </div>
<div style="display:none"> Gerrit-PatchSet: 7 </div>
<div style="display:none"> Gerrit-Owner: Holger Freyther <holger@freyther.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Holger Freyther <holger@freyther.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>