<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17743">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pcu: Enable 'egprs only' vty option if egprs requested<br><br>Change-Id: Idd0b5bf8769d693480268c0a0b89dbfd63779e48<br>---<br>M src/osmo_gsm_tester/bts.py<br>M src/osmo_gsm_tester/bts_osmotrx.py<br>M src/osmo_gsm_tester/pcu.py<br>M src/osmo_gsm_tester/pcu_oc2g.py<br>M src/osmo_gsm_tester/pcu_osmo.py<br>M src/osmo_gsm_tester/pcu_sysmo.py<br>M src/osmo_gsm_tester/templates/osmo-pcu-oc2g.cfg.tmpl<br>M src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl<br>M src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl<br>9 files changed, 25 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/bts.py b/src/osmo_gsm_tester/bts.py</span><br><span>index 6b0331e..2ca44d2 100644</span><br><span>--- a/src/osmo_gsm_tester/bts.py</span><br><span>+++ b/src/osmo_gsm_tester/bts.py</span><br><span>@@ -131,6 +131,9 @@</span><br><span> def remote_addr(self):</span><br><span> return self.conf.get('addr')</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def egprs_enabled(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ return self.conf_for_bsc()['gprs_mode'] == 'egprs'</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def cleanup(self):</span><br><span> 'Nothing to do by default. Subclass can override if required.'</span><br><span> pass</span><br><span>diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py</span><br><span>index 1322a74..22ff4b6 100644</span><br><span>--- a/src/osmo_gsm_tester/bts_osmotrx.py</span><br><span>+++ b/src/osmo_gsm_tester/bts_osmotrx.py</span><br><span>@@ -78,7 +78,7 @@</span><br><span> 'osmo_trx': {</span><br><span> 'bts_ip': self.remote_addr(),</span><br><span> 'trx_ip': self.trx_remote_ip(),</span><br><span style="color: hsl(0, 100%, 40%);">- 'egprs': 'enable' if self.conf_for_bsc()['gprs_mode'] == 'egprs' else 'disable',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'egprs': 'enable' if self.egprs_enabled() else 'disable',</span><br><span> 'channels': [{} for trx_i in range(self.num_trx())]</span><br><span> }</span><br><span> }</span><br><span>diff --git a/src/osmo_gsm_tester/pcu.py b/src/osmo_gsm_tester/pcu.py</span><br><span>index 9ec8f35..cc338cf 100644</span><br><span>--- a/src/osmo_gsm_tester/pcu.py</span><br><span>+++ b/src/osmo_gsm_tester/pcu.py</span><br><span>@@ -34,6 +34,13 @@</span><br><span> self.bts = bts</span><br><span> self.conf = conf</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+########################</span><br><span style="color: hsl(120, 100%, 40%);">+# PUBLIC - INTERNAL API</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%);">+ def egprs_enabled(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ return self.bts.egprs_enabled()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> ###################</span><br><span> # PUBLIC (test API included)</span><br><span> ###################</span><br><span>diff --git a/src/osmo_gsm_tester/pcu_oc2g.py b/src/osmo_gsm_tester/pcu_oc2g.py</span><br><span>index df96fe2..36aef60 100644</span><br><span>--- a/src/osmo_gsm_tester/pcu_oc2g.py</span><br><span>+++ b/src/osmo_gsm_tester/pcu_oc2g.py</span><br><span>@@ -111,7 +111,8 @@</span><br><span> config.overlay(values, {</span><br><span> 'osmo_pcu_oc2g': {</span><br><span> 'bts_addr': self.btsoc2g.remote_addr(),</span><br><span style="color: hsl(0, 100%, 40%);">- 'pcu_socket_path': self.btsoc2g.pcu_socket_path()</span><br><span style="color: hsl(120, 100%, 40%);">+ 'pcu_socket_path': self.btsoc2g.pcu_socket_path(),</span><br><span style="color: hsl(120, 100%, 40%);">+ 'egprs_enabled': self.egprs_enabled(),</span><br><span> }</span><br><span> })</span><br><span> config.overlay(values, { 'osmo_pcu_oc2g': self.conf })</span><br><span>diff --git a/src/osmo_gsm_tester/pcu_osmo.py b/src/osmo_gsm_tester/pcu_osmo.py</span><br><span>index c5f45d1..aac6901 100644</span><br><span>--- a/src/osmo_gsm_tester/pcu_osmo.py</span><br><span>+++ b/src/osmo_gsm_tester/pcu_osmo.py</span><br><span>@@ -70,6 +70,7 @@</span><br><span> 'osmo_pcu': {</span><br><span> 'bts_addr': self.bts.remote_addr(),</span><br><span> 'pcu_socket_path': self.bts.pcu_socket_path(),</span><br><span style="color: hsl(120, 100%, 40%);">+ 'egprs_enabled': self.egprs_enabled(),</span><br><span> }</span><br><span> })</span><br><span> config.overlay(values, { 'osmo_pcu': self.conf })</span><br><span>diff --git a/src/osmo_gsm_tester/pcu_sysmo.py b/src/osmo_gsm_tester/pcu_sysmo.py</span><br><span>index 3f6149d..8998622 100644</span><br><span>--- a/src/osmo_gsm_tester/pcu_sysmo.py</span><br><span>+++ b/src/osmo_gsm_tester/pcu_sysmo.py</span><br><span>@@ -111,7 +111,8 @@</span><br><span> config.overlay(values, {</span><br><span> 'osmo_pcu_sysmo': {</span><br><span> 'bts_addr': self.sysmobts.remote_addr(),</span><br><span style="color: hsl(0, 100%, 40%);">- 'pcu_socket_path': self.sysmobts.pcu_socket_path()</span><br><span style="color: hsl(120, 100%, 40%);">+ 'pcu_socket_path': self.sysmobts.pcu_socket_path(),</span><br><span style="color: hsl(120, 100%, 40%);">+ 'egprs_enabled': self.egprs_enabled(),</span><br><span> }</span><br><span> })</span><br><span> config.overlay(values, { 'osmo_pcu_sysmo': self.conf })</span><br><span>diff --git a/src/osmo_gsm_tester/templates/osmo-pcu-oc2g.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-pcu-oc2g.cfg.tmpl</span><br><span>index 0b1cd2d..f5eb03e 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/osmo-pcu-oc2g.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-pcu-oc2g.cfg.tmpl</span><br><span>@@ -15,6 +15,9 @@</span><br><span> alloc-algorithm dynamic</span><br><span> alpha 0</span><br><span> gamma 0</span><br><span style="color: hsl(120, 100%, 40%);">+%if osmo_pcu_oc2g.egprs_enabled:</span><br><span style="color: hsl(120, 100%, 40%);">+ egprs only</span><br><span style="color: hsl(120, 100%, 40%);">+%endif</span><br><span> gsmtap-category dl-unknown</span><br><span> !gsmtap-category dl-dummy</span><br><span> gsmtap-category dl-ctrl</span><br><span>diff --git a/src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl</span><br><span>index ea1a69a..c0e6cd2 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl</span><br><span>@@ -15,6 +15,9 @@</span><br><span> alloc-algorithm dynamic</span><br><span> alpha 0</span><br><span> gamma 0</span><br><span style="color: hsl(120, 100%, 40%);">+%if osmo_pcu_sysmo.egprs_enabled:</span><br><span style="color: hsl(120, 100%, 40%);">+ egprs only</span><br><span style="color: hsl(120, 100%, 40%);">+%endif</span><br><span> gsmtap-category dl-unknown</span><br><span> !gsmtap-category dl-dummy</span><br><span> gsmtap-category dl-ctrl</span><br><span>diff --git a/src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl</span><br><span>index 1d050c1..7445609 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl</span><br><span>@@ -15,6 +15,9 @@</span><br><span> alloc-algorithm dynamic</span><br><span> alpha 0</span><br><span> gamma 0</span><br><span style="color: hsl(120, 100%, 40%);">+%if osmo_pcu.egprs_enabled:</span><br><span style="color: hsl(120, 100%, 40%);">+ egprs only</span><br><span style="color: hsl(120, 100%, 40%);">+%endif</span><br><span> gsmtap-category dl-unknown</span><br><span> !gsmtap-category dl-dummy</span><br><span> gsmtap-category dl-ctrl</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17743">change 17743</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/+/17743"/><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: Idd0b5bf8769d693480268c0a0b89dbfd63779e48 </div>
<div style="display:none"> Gerrit-Change-Number: 17743 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>