<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17737">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pcu: Improve logging and gsmtap<br><br>Change-Id: I506a39b114eed55a185d329cea5e9d6ba379a2ae<br>---<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-bts-oc2g.cfg.tmpl<br>M src/osmo_gsm_tester/templates/osmo-bts-octphy.cfg.tmpl<br>M src/osmo_gsm_tester/templates/osmo-bts-sysmo.cfg.tmpl<br>M src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl<br>M src/osmo_gsm_tester/templates/osmo-bts-virtual.cfg.tmpl<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>11 files changed, 87 insertions(+), 27 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/37/17737/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/pcu_oc2g.py b/src/osmo_gsm_tester/pcu_oc2g.py</span><br><span>index b0572f4..df96fe2 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>@@ -110,6 +110,7 @@</span><br><span> config.overlay(values, self.suite_run.config())</span><br><span> config.overlay(values, {</span><br><span> 'osmo_pcu_oc2g': {</span><br><span style="color: hsl(120, 100%, 40%);">+ 'bts_addr': self.btsoc2g.remote_addr(),</span><br><span> 'pcu_socket_path': self.btsoc2g.pcu_socket_path()</span><br><span> }</span><br><span> })</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 767264c..c5f45d1 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>@@ -68,6 +68,7 @@</span><br><span> config.overlay(values, self.suite_run.config())</span><br><span> config.overlay(values, {</span><br><span> 'osmo_pcu': {</span><br><span style="color: hsl(120, 100%, 40%);">+ 'bts_addr': self.bts.remote_addr(),</span><br><span> 'pcu_socket_path': self.bts.pcu_socket_path(),</span><br><span> }</span><br><span> })</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 cd3b75e..3f6149d 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>@@ -110,6 +110,7 @@</span><br><span> config.overlay(values, self.suite_run.config())</span><br><span> config.overlay(values, {</span><br><span> 'osmo_pcu_sysmo': {</span><br><span style="color: hsl(120, 100%, 40%);">+ 'bts_addr': self.sysmobts.remote_addr(),</span><br><span> 'pcu_socket_path': self.sysmobts.pcu_socket_path()</span><br><span> }</span><br><span> })</span><br><span>diff --git a/src/osmo_gsm_tester/templates/osmo-bts-oc2g.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-oc2g.cfg.tmpl</span><br><span>index 1927061..d4f73ad 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/osmo-bts-oc2g.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-bts-oc2g.cfg.tmpl</span><br><span>@@ -33,9 +33,9 @@</span><br><span> gsmtap-sapi sdcch</span><br><span> gsmtap-sapi tch/f</span><br><span> gsmtap-sapi tch/h</span><br><span style="color: hsl(0, 100%, 40%);">- gsmtap-sapi pacch</span><br><span style="color: hsl(0, 100%, 40%);">- gsmtap-sapi pdtch</span><br><span style="color: hsl(0, 100%, 40%);">- gsmtap-sapi ptcch</span><br><span style="color: hsl(120, 100%, 40%);">+ !gsmtap-sapi pacch</span><br><span style="color: hsl(120, 100%, 40%);">+ !gsmtap-sapi pdtch</span><br><span style="color: hsl(120, 100%, 40%);">+ !gsmtap-sapi ptcch</span><br><span> gsmtap-sapi cbch</span><br><span> gsmtap-sapi sacch</span><br><span> trx 0</span><br><span>diff --git a/src/osmo_gsm_tester/templates/osmo-bts-octphy.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-octphy.cfg.tmpl</span><br><span>index 3548979..b816036 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/osmo-bts-octphy.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-bts-octphy.cfg.tmpl</span><br><span>@@ -39,9 +39,9 @@</span><br><span> gsmtap-sapi sdcch</span><br><span> gsmtap-sapi tch/f</span><br><span> gsmtap-sapi tch/h</span><br><span style="color: hsl(0, 100%, 40%);">- gsmtap-sapi pacch</span><br><span style="color: hsl(0, 100%, 40%);">- gsmtap-sapi pdtch</span><br><span style="color: hsl(0, 100%, 40%);">- gsmtap-sapi ptcch</span><br><span style="color: hsl(120, 100%, 40%);">+ !gsmtap-sapi pacch</span><br><span style="color: hsl(120, 100%, 40%);">+ !gsmtap-sapi pdtch</span><br><span style="color: hsl(120, 100%, 40%);">+ !gsmtap-sapi ptcch</span><br><span> gsmtap-sapi cbch</span><br><span> gsmtap-sapi sacch</span><br><span> %for trx in osmo_bts_octphy.trx_list:</span><br><span>diff --git a/src/osmo_gsm_tester/templates/osmo-bts-sysmo.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-sysmo.cfg.tmpl</span><br><span>index 536e5cb..2533354 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/osmo-bts-sysmo.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-bts-sysmo.cfg.tmpl</span><br><span>@@ -32,9 +32,9 @@</span><br><span> gsmtap-sapi sdcch</span><br><span> gsmtap-sapi tch/f</span><br><span> gsmtap-sapi tch/h</span><br><span style="color: hsl(0, 100%, 40%);">- gsmtap-sapi pacch</span><br><span style="color: hsl(0, 100%, 40%);">- gsmtap-sapi pdtch</span><br><span style="color: hsl(0, 100%, 40%);">- gsmtap-sapi ptcch</span><br><span style="color: hsl(120, 100%, 40%);">+ !gsmtap-sapi pacch</span><br><span style="color: hsl(120, 100%, 40%);">+ !gsmtap-sapi pdtch</span><br><span style="color: hsl(120, 100%, 40%);">+ !gsmtap-sapi ptcch</span><br><span> gsmtap-sapi cbch</span><br><span> gsmtap-sapi sacch</span><br><span> trx 0</span><br><span>diff --git a/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl</span><br><span>index 2239f74..8a962a5 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl</span><br><span>@@ -44,9 +44,9 @@</span><br><span> gsmtap-sapi sdcch</span><br><span> gsmtap-sapi tch/f</span><br><span> gsmtap-sapi tch/h</span><br><span style="color: hsl(0, 100%, 40%);">- gsmtap-sapi pacch</span><br><span style="color: hsl(0, 100%, 40%);">- gsmtap-sapi pdtch</span><br><span style="color: hsl(0, 100%, 40%);">- gsmtap-sapi ptcch</span><br><span style="color: hsl(120, 100%, 40%);">+ !gsmtap-sapi pacch</span><br><span style="color: hsl(120, 100%, 40%);">+ !gsmtap-sapi pdtch</span><br><span style="color: hsl(120, 100%, 40%);">+ !gsmtap-sapi ptcch</span><br><span> gsmtap-sapi cbch</span><br><span> gsmtap-sapi sacch</span><br><span> %for chan in osmo_bts_trx.osmo_trx.channels:</span><br><span>diff --git a/src/osmo_gsm_tester/templates/osmo-bts-virtual.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-virtual.cfg.tmpl</span><br><span>index cb2e1ec..2276c86 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/osmo-bts-virtual.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-bts-virtual.cfg.tmpl</span><br><span>@@ -35,9 +35,9 @@</span><br><span> gsmtap-sapi sdcch</span><br><span> gsmtap-sapi tch/f</span><br><span> gsmtap-sapi tch/h</span><br><span style="color: hsl(0, 100%, 40%);">- gsmtap-sapi pacch</span><br><span style="color: hsl(0, 100%, 40%);">- gsmtap-sapi pdtch</span><br><span style="color: hsl(0, 100%, 40%);">- gsmtap-sapi ptcch</span><br><span style="color: hsl(120, 100%, 40%);">+ !gsmtap-sapi pacch</span><br><span style="color: hsl(120, 100%, 40%);">+ !gsmtap-sapi pdtch</span><br><span style="color: hsl(120, 100%, 40%);">+ !gsmtap-sapi ptcch</span><br><span> gsmtap-sapi cbch</span><br><span> gsmtap-sapi sacch</span><br><span> trx 0</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 5c03636..0b1cd2d 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>@@ -1,8 +1,13 @@</span><br><span> log stderr</span><br><span style="color: hsl(0, 100%, 40%);">- logging color 1</span><br><span style="color: hsl(0, 100%, 40%);">- logging print extended-timestamp 1</span><br><span style="color: hsl(0, 100%, 40%);">- logging print category 1</span><br><span style="color: hsl(0, 100%, 40%);">- logging level set-all info</span><br><span style="color: hsl(120, 100%, 40%);">+ logging color 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print extended-timestamp 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print category 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print category-hex 0</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print file basename</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level set-all info</span><br><span style="color: hsl(120, 100%, 40%);">+line vty</span><br><span style="color: hsl(120, 100%, 40%);">+ no login</span><br><span style="color: hsl(120, 100%, 40%);">+ bind ${osmo_pcu_oc2g.bts_addr}</span><br><span> pcu</span><br><span> pcu-socket ${osmo_pcu_oc2g.pcu_socket_path}</span><br><span> flow-control-interval 10</span><br><span>@@ -10,3 +15,17 @@</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%);">+ gsmtap-category dl-unknown</span><br><span style="color: hsl(120, 100%, 40%);">+ !gsmtap-category dl-dummy</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-category dl-ctrl</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-category dl-data-gprs</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-category dl-data-egprs</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-category dl-ptcch</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-category dl-agch</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-category dl-pch</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-category ul-unknown</span><br><span style="color: hsl(120, 100%, 40%);">+ !gsmtap-category ul-dummy</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-category ul-ctrl</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-category ul-data-gprs</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-category ul-data-egprs</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-category ul-rach</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 bcb3d7c..ea1a69a 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>@@ -1,8 +1,13 @@</span><br><span> log stderr</span><br><span style="color: hsl(0, 100%, 40%);">- logging color 1</span><br><span style="color: hsl(0, 100%, 40%);">- logging print extended-timestamp 1</span><br><span style="color: hsl(0, 100%, 40%);">- logging print category 1</span><br><span style="color: hsl(0, 100%, 40%);">- logging level set-all info</span><br><span style="color: hsl(120, 100%, 40%);">+ logging color 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print extended-timestamp 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print category 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print category-hex 0</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print file basename</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level set-all info</span><br><span style="color: hsl(120, 100%, 40%);">+line vty</span><br><span style="color: hsl(120, 100%, 40%);">+ no login</span><br><span style="color: hsl(120, 100%, 40%);">+ bind ${osmo_pcu_sysmo.bts_addr}</span><br><span> pcu</span><br><span> pcu-socket ${osmo_pcu_sysmo.pcu_socket_path}</span><br><span> flow-control-interval 10</span><br><span>@@ -10,3 +15,17 @@</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%);">+ gsmtap-category dl-unknown</span><br><span style="color: hsl(120, 100%, 40%);">+ !gsmtap-category dl-dummy</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-category dl-ctrl</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-category dl-data-gprs</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-category dl-data-egprs</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-category dl-ptcch</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-category dl-agch</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-category dl-pch</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-category ul-unknown</span><br><span style="color: hsl(120, 100%, 40%);">+ !gsmtap-category ul-dummy</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-category ul-ctrl</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-category ul-data-gprs</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-category ul-data-egprs</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-category ul-rach</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 da7425c..1d050c1 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>@@ -1,8 +1,13 @@</span><br><span> log stderr</span><br><span style="color: hsl(0, 100%, 40%);">- logging color 1</span><br><span style="color: hsl(0, 100%, 40%);">- logging print extended-timestamp 1</span><br><span style="color: hsl(0, 100%, 40%);">- logging print category 1</span><br><span style="color: hsl(0, 100%, 40%);">- logging level set-all info</span><br><span style="color: hsl(120, 100%, 40%);">+ logging color 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print extended-timestamp 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print category 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print category-hex 0</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print file basename</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level set-all info</span><br><span style="color: hsl(120, 100%, 40%);">+line vty</span><br><span style="color: hsl(120, 100%, 40%);">+ no login</span><br><span style="color: hsl(120, 100%, 40%);">+ bind ${osmo_pcu.bts_addr}</span><br><span> pcu</span><br><span> pcu-socket ${osmo_pcu.pcu_socket_path}</span><br><span> flow-control-interval 10</span><br><span>@@ -10,3 +15,17 @@</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%);">+ gsmtap-category dl-unknown</span><br><span style="color: hsl(120, 100%, 40%);">+ !gsmtap-category dl-dummy</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-category dl-ctrl</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-category dl-data-gprs</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-category dl-data-egprs</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-category dl-ptcch</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-category dl-agch</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-category dl-pch</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-category ul-unknown</span><br><span style="color: hsl(120, 100%, 40%);">+ !gsmtap-category ul-dummy</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-category ul-ctrl</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-category ul-data-gprs</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-category ul-data-egprs</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-category ul-rach</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17737">change 17737</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/+/17737"/><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: I506a39b114eed55a185d329cea5e9d6ba379a2ae </div>
<div style="display:none"> Gerrit-Change-Number: 17737 </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-MessageType: newchange </div>