<p>pespin <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/14547">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Introduce osmux support for msc,bsc,mgw<br><br>Change-Id: Ief3518e77650f2cddb48357b07fe95346e46ee1b<br>---<br>M src/osmo_gsm_tester/osmo_bsc.py<br>M src/osmo_gsm_tester/osmo_mgw.py<br>M src/osmo_gsm_tester/osmo_msc.py<br>M src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl<br>M src/osmo_gsm_tester/templates/osmo-mgw.cfg.tmpl<br>M src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl<br>6 files changed, 41 insertions(+), 1 deletion(-)<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 ec9c3b8..4160527 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>@@ -32,6 +32,7 @@</span><br><span> self.process = None</span><br><span> self.encryption = None</span><br><span> self.rsl_ip = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self.use_osmux = "off"</span><br><span> self.suite_run = suite_run</span><br><span> self.ip_address = ip_address</span><br><span> self.bts = []</span><br><span>@@ -90,6 +91,7 @@</span><br><span> else:</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 style="color: hsl(120, 100%, 40%);">+ config.overlay(values, dict(bsc=dict(use_osmux=self.use_osmux)))</span><br><span> </span><br><span> if self.rsl_ip is not None:</span><br><span> config.overlay(values, dict(bsc=dict(net=dict(rsl_ip=self.rsl_ip))))</span><br><span>@@ -113,6 +115,15 @@</span><br><span> other external entities to test the RSL path, such as TTCN3 tests.'''</span><br><span> self.rsl_ip = ip_addr</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def set_use_osmux(self, use=False, force=False):</span><br><span style="color: hsl(120, 100%, 40%);">+ if not use:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.use_osmux = "off"</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ if not force:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.use_osmux = "on"</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.use_osmux = "only"</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/osmo_mgw.py b/src/osmo_gsm_tester/osmo_mgw.py</span><br><span>index ca7bd51..ea8e652 100644</span><br><span>--- a/src/osmo_gsm_tester/osmo_mgw.py</span><br><span>+++ b/src/osmo_gsm_tester/osmo_mgw.py</span><br><span>@@ -31,6 +31,7 @@</span><br><span> self.process = None</span><br><span> self.suite_run = suite_run</span><br><span> self.ip_address = ip_address</span><br><span style="color: hsl(120, 100%, 40%);">+ self.use_osmux = "off"</span><br><span> </span><br><span> def start(self):</span><br><span> self.log('Starting osmo-mgw')</span><br><span>@@ -63,7 +64,11 @@</span><br><span> </span><br><span> values = dict(mgw=config.get_defaults('mgw'))</span><br><span> config.overlay(values, self.suite_run.config())</span><br><span style="color: hsl(0, 100%, 40%);">- config.overlay(values, dict(mgw=dict(ip_address=self.ip_address)))</span><br><span style="color: hsl(120, 100%, 40%);">+ config.overlay(values, { 'mgw': {</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ip_address': self.ip_address,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'use_osmux': self.use_osmux</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ })</span><br><span> </span><br><span> self.dbg('MGW CONFIG:\n' + pprint.pformat(values))</span><br><span> </span><br><span>@@ -81,4 +86,14 @@</span><br><span> def running(self):</span><br><span> return not self.process.terminated()</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def set_use_osmux(self, use=False, force=False):</span><br><span style="color: hsl(120, 100%, 40%);">+ if not use:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.use_osmux = "off"</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ if not force:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.use_osmux = "on"</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.use_osmux = "only"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # vim: expandtab tabstop=4 shiftwidth=4</span><br><span>diff --git a/src/osmo_gsm_tester/osmo_msc.py b/src/osmo_gsm_tester/osmo_msc.py</span><br><span>index 192926c..51f50c4 100644</span><br><span>--- a/src/osmo_gsm_tester/osmo_msc.py</span><br><span>+++ b/src/osmo_gsm_tester/osmo_msc.py</span><br><span>@@ -32,6 +32,7 @@</span><br><span> self.config = None</span><br><span> self.encryption = None</span><br><span> self.authentication = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self.use_osmux = "off"</span><br><span> self.suite_run = suite_run</span><br><span> self.ip_address = ip_address</span><br><span> self.hlr = hlr</span><br><span>@@ -84,6 +85,7 @@</span><br><span> config.overlay(values, dict(msc=dict(net=dict(encryption=encryption_vty))))</span><br><span> if self.authentication is not None:</span><br><span> config.overlay(values, dict(msc=dict(net=dict(authentication=self.authentication))))</span><br><span style="color: hsl(120, 100%, 40%);">+ config.overlay(values, dict(msc=dict(use_osmux=self.use_osmux)))</span><br><span> </span><br><span> </span><br><span> self.config = values</span><br><span>@@ -107,6 +109,15 @@</span><br><span> return</span><br><span> self.authentication = "required" if val else "optional"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def set_use_osmux(self, use=False, force=False):</span><br><span style="color: hsl(120, 100%, 40%);">+ if not use:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.use_osmux = "off"</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ if not force:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.use_osmux = "on"</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.use_osmux = "only"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def mcc(self):</span><br><span> return self.config['msc']['net']['mcc']</span><br><span> </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 53e683b..572e765 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>@@ -118,5 +118,6 @@</span><br><span> amr-config 5_90k allowed</span><br><span> amr-config 5_15k forbidden</span><br><span> amr-config 4_75k forbidden</span><br><span style="color: hsl(120, 100%, 40%);">+ osmux ${bsc.use_osmux}</span><br><span> msc-addr msc_remote</span><br><span> bsc-addr bsc_local</span><br><span>diff --git a/src/osmo_gsm_tester/templates/osmo-mgw.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-mgw.cfg.tmpl</span><br><span>index 9e338e1..f91ab30 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/osmo-mgw.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-mgw.cfg.tmpl</span><br><span>@@ -14,3 +14,4 @@</span><br><span> number endpoints 31</span><br><span> rtcp-omit</span><br><span> rtp-accept-all 1</span><br><span style="color: hsl(120, 100%, 40%);">+ osmux ${mgw.use_osmux}</span><br><span>diff --git a/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl</span><br><span>index b370d5e..31c57d3 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl</span><br><span>@@ -28,6 +28,7 @@</span><br><span> mgw local-ip ${msc.ip_address.addr}</span><br><span> mgw endpoint-range 1 31</span><br><span> mgw bts-base 8000</span><br><span style="color: hsl(120, 100%, 40%);">+ osmux ${msc.use_osmux}</span><br><span> assign-tmsi</span><br><span> cs7-instance-iu 0</span><br><span> cs7-instance-a 0</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/14547">change 14547</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/+/14547"/><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: Ief3518e77650f2cddb48357b07fe95346e46ee1b </div>
<div style="display:none"> Gerrit-Change-Number: 14547 </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-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>