<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11750">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, but someone else must approve
Pau Espin Pedrol: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">nanobts: Use -G parameter of ipaccess-config to avoid need to restart nanoBTS<br><br>If OML IP doesn't need to be changed because it's the one already<br>configured, then there's no need to set + restart the nanoBTS, which<br>means we can speed up a test running a nanoBTS by aprox 2 minutes per<br>nanoBTS used.<br><br>Requires osmo-bsc.git 5c2485dcff35996fce328798351af79c0ff4474c, which<br>fixes json generation in ipaccess-config after -G -q was implemented.<br><br>Related: OS#3624<br>Change-Id: I2871dee3de11512250445127f0b807a8990fd4c6<br>---<br>M src/osmo_gsm_tester/bts_nanobts.py<br>1 file changed, 36 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/bts_nanobts.py b/src/osmo_gsm_tester/bts_nanobts.py</span><br><span>index ab75b16..5fe8bae 100644</span><br><span>--- a/src/osmo_gsm_tester/bts_nanobts.py</span><br><span>+++ b/src/osmo_gsm_tester/bts_nanobts.py</span><br><span>@@ -19,6 +19,7 @@</span><br><span> </span><br><span> import os</span><br><span> import re</span><br><span style="color: hsl(120, 100%, 40%);">+import json</span><br><span> from . import log, config, util, process, pcap_recorder, bts, pcu</span><br><span> from . import powersupply</span><br><span> from .event_loop import MainLoop</span><br><span>@@ -122,24 +123,31 @@</span><br><span> ipfind.stop()</span><br><span> </span><br><span> ipconfig = IpAccessConfig(self.suite_run, self.run_dir, bts_trx_ip)</span><br><span style="color: hsl(120, 100%, 40%);">+ running_oml_ip = ipconfig.get_oml_ip()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if running_unitid != unitid or running_trx != trx_i:</span><br><span> if not ipconfig.set_unit_id(unitid, trx_i, False):</span><br><span> raise log.Error('Failed configuring unit id %d trx %d' % (unitid, trx_i))</span><br><span style="color: hsl(0, 100%, 40%);">- # Apply OML IP and restart nanoBTS as it is required to apply the changes.</span><br><span style="color: hsl(0, 100%, 40%);">- if not ipconfig.set_oml_ip(self.bsc.addr(), True):</span><br><span style="color: hsl(0, 100%, 40%);">- raise log.Error('Failed configuring OML IP %s' % bts_trx_ip)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- # Let some time for BTS to restart. It takes much more than 20 secs, and</span><br><span style="color: hsl(0, 100%, 40%);">- # this way we make sure we don't catch responses in abisip-find prior to</span><br><span style="color: hsl(0, 100%, 40%);">- # BTS restarting.</span><br><span style="color: hsl(0, 100%, 40%);">- MainLoop.sleep(self, 20)</span><br><span style="color: hsl(120, 100%, 40%);">+ if running_oml_ip != self.bsc.addr():</span><br><span style="color: hsl(120, 100%, 40%);">+ # Apply OML IP and restart nanoBTS as it is required to apply the changes.</span><br><span style="color: hsl(120, 100%, 40%);">+ self.dbg('Current OML IPaddr "%s" does not match BSC IPaddr "%s", reconfiguring and restarting it' % (running_oml_ip, self.bsc.addr()))</span><br><span style="color: hsl(120, 100%, 40%);">+ if not ipconfig.set_oml_ip(self.bsc.addr(), True):</span><br><span style="color: hsl(120, 100%, 40%);">+ raise log.Error('Failed configuring OML IP %s' % bts_trx_ip)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- self.log('Starting to connect id %d trx %d to' % (unitid, trx_i), self.bsc)</span><br><span style="color: hsl(0, 100%, 40%);">- ipfind = AbisIpFind(self.suite_run, self.run_dir, local_bind_ip, 'postconf')</span><br><span style="color: hsl(0, 100%, 40%);">- ipfind.start()</span><br><span style="color: hsl(0, 100%, 40%);">- ipfind.wait_bts_ready(bts_trx_ip)</span><br><span style="color: hsl(0, 100%, 40%);">- self.log('nanoBTS id %d trx %d configured and running' % (unitid, trx_i))</span><br><span style="color: hsl(0, 100%, 40%);">- ipfind.stop()</span><br><span style="color: hsl(120, 100%, 40%);">+ # Let some time for BTS to restart. It takes much more than 20 secs, and</span><br><span style="color: hsl(120, 100%, 40%);">+ # this way we make sure we don't catch responses in abisip-find prior to</span><br><span style="color: hsl(120, 100%, 40%);">+ # BTS restarting.</span><br><span style="color: hsl(120, 100%, 40%);">+ MainLoop.sleep(self, 20)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ self.dbg('Starting to connect id %d trx %d to' % (unitid, trx_i), self.bsc)</span><br><span style="color: hsl(120, 100%, 40%);">+ ipfind = AbisIpFind(self.suite_run, self.run_dir, local_bind_ip, 'postconf')</span><br><span style="color: hsl(120, 100%, 40%);">+ ipfind.start()</span><br><span style="color: hsl(120, 100%, 40%);">+ ipfind.wait_bts_ready(bts_trx_ip)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log('nanoBTS id %d trx %d configured and running' % (unitid, trx_i))</span><br><span style="color: hsl(120, 100%, 40%);">+ ipfind.stop()</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.dbg('nanoBTS id %d trx %d no need to change OML IP (%s) and restart' % (unitid, trx_i, running_oml_ip))</span><br><span> </span><br><span> MainLoop.wait(self, self.bsc.bts_is_connected, self, timeout=600)</span><br><span> self.log('nanoBTS connected to BSC')</span><br><span>@@ -274,20 +282,30 @@</span><br><span> def set_unit_id(self, unitid, trx_num, restart=False):</span><br><span> uid_str = '%d/0/%d' % (unitid, trx_num)</span><br><span> if restart:</span><br><span style="color: hsl(0, 100%, 40%);">- retcode = self.run('unitid', '--restart', '--unit-id', '%s' % uid_str, self.bts_ip)</span><br><span style="color: hsl(120, 100%, 40%);">+ retcode = self.run('setunitid', '--restart', '--unit-id', '%s' % uid_str, self.bts_ip)</span><br><span> else:</span><br><span style="color: hsl(0, 100%, 40%);">- retcode = self.run('unitid', '--unit-id', '%s' % uid_str, self.bts_ip)</span><br><span style="color: hsl(120, 100%, 40%);">+ retcode = self.run('setunitid', '--unit-id', '%s' % uid_str, self.bts_ip)</span><br><span> if retcode != 0:</span><br><span style="color: hsl(0, 100%, 40%);">- log.err('ipaccess-config --unit-id %s returned error code %d' % (uid_str, retcode))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.err('ipaccess-config --unit-id %s returned error code %d' % (uid_str, retcode))</span><br><span> return retcode == 0</span><br><span> </span><br><span> def set_oml_ip(self, omlip, restart=False):</span><br><span> if restart:</span><br><span style="color: hsl(0, 100%, 40%);">- retcode = self.run('oml', '--restart', '--oml-ip', omlip, self.bts_ip)</span><br><span style="color: hsl(120, 100%, 40%);">+ retcode = self.run('setoml', '--restart', '--oml-ip', omlip, self.bts_ip)</span><br><span> else:</span><br><span style="color: hsl(0, 100%, 40%);">- retcode = self.run('oml', '--oml-ip', omlip, self.bts_ip)</span><br><span style="color: hsl(120, 100%, 40%);">+ retcode = self.run('setoml', '--oml-ip', omlip, self.bts_ip)</span><br><span> if retcode != 0:</span><br><span> self.error('ipaccess-config --oml-ip %s returned error code %d' % (omlip, retcode))</span><br><span> return retcode == 0</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def get_oml_ip(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ retcode = self.run('getoml', '-q', '-G', self.bts_ip)</span><br><span style="color: hsl(120, 100%, 40%);">+ if retcode != 0:</span><br><span style="color: hsl(120, 100%, 40%);">+ raise log.Error('ipaccess-config -q -G %s returned error code %d' % (self.bts_ip, retcode))</span><br><span style="color: hsl(120, 100%, 40%);">+ output = self.proc.get_stdout()</span><br><span style="color: hsl(120, 100%, 40%);">+ # Our logging system adds "launched on" line at the start, so let's skip until the json code:</span><br><span style="color: hsl(120, 100%, 40%);">+ output_json = output[output.index('{'):]</span><br><span style="color: hsl(120, 100%, 40%);">+ json_data = json.loads(output_json)</span><br><span style="color: hsl(120, 100%, 40%);">+ return json_data['primary_oml_ip']</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # vim: expandtab tabstop=4 shiftwidth=4</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11750">change 11750</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/11750"/><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: I2871dee3de11512250445127f0b807a8990fd4c6 </div>
<div style="display:none"> Gerrit-Change-Number: 11750 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>