<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9297">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bsc: Add API to mock BSC RSL IP addr<br><br>Change-Id: I9ca67964e656943b50967a27a88054fd3e484672<br>---<br>M src/osmo_gsm_tester/osmo_bsc.py<br>M src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl<br>2 files changed, 13 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/osmo_bsc.py b/src/osmo_gsm_tester/osmo_bsc.py</span><br><span>index 2c909bc..323b9ec 100644</span><br><span>--- a/src/osmo_gsm_tester/osmo_bsc.py</span><br><span>+++ b/src/osmo_gsm_tester/osmo_bsc.py</span><br><span>@@ -31,6 +31,7 @@</span><br><span>     process = None</span><br><span>     bts = None</span><br><span>     encryption = None</span><br><span style="color: hsl(120, 100%, 40%);">+    rsl_ip = None</span><br><span>     mgw = None</span><br><span>     stp = None</span><br><span> </span><br><span>@@ -92,6 +93,9 @@</span><br><span>             encryption_vty = util.encryption2osmovty(values['bsc']['net']['encryption'])</span><br><span>         config.overlay(values, dict(bsc=dict(net=dict(encryption=encryption_vty))))</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+        if self.rsl_ip is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+            config.overlay(values, dict(bsc=dict(net=dict(rsl_ip=self.rsl_ip))))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>         self.dbg('BSC CONFIG:\n' + pprint.pformat(values))</span><br><span> </span><br><span>         with open(self.config_file, 'w') as f:</span><br><span>@@ -105,6 +109,12 @@</span><br><span>     def set_encryption(self, val):</span><br><span>         self.encryption = val</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+    def set_rsl_ip(self, ip_addr):</span><br><span style="color: hsl(120, 100%, 40%);">+        '''Overwrite RSL IPaddr option sent to all BTS during OML config. Useful</span><br><span style="color: hsl(120, 100%, 40%);">+        for tests only willing to use osmo-bsc to do the OML setup but using</span><br><span style="color: hsl(120, 100%, 40%);">+        other external entities to test the RSL path, such as TTCN3 tests.'''</span><br><span style="color: hsl(120, 100%, 40%);">+        self.rsl_ip = ip_addr</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>     def bts_add(self, bts):</span><br><span>         self.bts.append(bts)</span><br><span>         bts.set_bsc(self)</span><br><span>diff --git a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl</span><br><span>index 71b44cf..814cf97 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl</span><br><span>@@ -52,6 +52,9 @@</span><br><span>   channel allocator ascending</span><br><span>   rach tx integer 9</span><br><span>   rach max transmission 7</span><br><span style="color: hsl(120, 100%, 40%);">+% if bsc.net.get('rsl_ip', False):</span><br><span style="color: hsl(120, 100%, 40%);">+  ip.access rsl-ip ${bsc.net.rsl_ip}</span><br><span style="color: hsl(120, 100%, 40%);">+% endif</span><br><span>   ip.access unit_id ${bts.ipa_unit_id} 0</span><br><span>   oml ip.access stream_id ${bts.stream_id} line 0</span><br><span> % if bts.get('sgsn', False):</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9297">change 9297</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/9297"/><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: I9ca67964e656943b50967a27a88054fd3e484672 </div>
<div style="display:none"> Gerrit-Change-Number: 9297 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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 </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>