This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
pespin gerrit-no-reply at lists.osmocom.orgpespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17737 ) Change subject: pcu: Improve logging and gsmtap ...................................................................... pcu: Improve logging and gsmtap Change-Id: I506a39b114eed55a185d329cea5e9d6ba379a2ae --- M src/osmo_gsm_tester/pcu_oc2g.py M src/osmo_gsm_tester/pcu_osmo.py M src/osmo_gsm_tester/pcu_sysmo.py M src/osmo_gsm_tester/templates/osmo-bts-oc2g.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-bts-octphy.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-bts-sysmo.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-bts-virtual.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-pcu-oc2g.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl 11 files changed, 87 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/37/17737/1 diff --git a/src/osmo_gsm_tester/pcu_oc2g.py b/src/osmo_gsm_tester/pcu_oc2g.py index b0572f4..df96fe2 100644 --- a/src/osmo_gsm_tester/pcu_oc2g.py +++ b/src/osmo_gsm_tester/pcu_oc2g.py @@ -110,6 +110,7 @@ config.overlay(values, self.suite_run.config()) config.overlay(values, { 'osmo_pcu_oc2g': { + 'bts_addr': self.btsoc2g.remote_addr(), 'pcu_socket_path': self.btsoc2g.pcu_socket_path() } }) diff --git a/src/osmo_gsm_tester/pcu_osmo.py b/src/osmo_gsm_tester/pcu_osmo.py index 767264c..c5f45d1 100644 --- a/src/osmo_gsm_tester/pcu_osmo.py +++ b/src/osmo_gsm_tester/pcu_osmo.py @@ -68,6 +68,7 @@ config.overlay(values, self.suite_run.config()) config.overlay(values, { 'osmo_pcu': { + 'bts_addr': self.bts.remote_addr(), 'pcu_socket_path': self.bts.pcu_socket_path(), } }) diff --git a/src/osmo_gsm_tester/pcu_sysmo.py b/src/osmo_gsm_tester/pcu_sysmo.py index cd3b75e..3f6149d 100644 --- a/src/osmo_gsm_tester/pcu_sysmo.py +++ b/src/osmo_gsm_tester/pcu_sysmo.py @@ -110,6 +110,7 @@ config.overlay(values, self.suite_run.config()) config.overlay(values, { 'osmo_pcu_sysmo': { + 'bts_addr': self.sysmobts.remote_addr(), 'pcu_socket_path': self.sysmobts.pcu_socket_path() } }) diff --git a/src/osmo_gsm_tester/templates/osmo-bts-oc2g.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-oc2g.cfg.tmpl index 1927061..d4f73ad 100644 --- a/src/osmo_gsm_tester/templates/osmo-bts-oc2g.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bts-oc2g.cfg.tmpl @@ -33,9 +33,9 @@ gsmtap-sapi sdcch gsmtap-sapi tch/f gsmtap-sapi tch/h - gsmtap-sapi pacch - gsmtap-sapi pdtch - gsmtap-sapi ptcch + !gsmtap-sapi pacch + !gsmtap-sapi pdtch + !gsmtap-sapi ptcch gsmtap-sapi cbch gsmtap-sapi sacch trx 0 diff --git a/src/osmo_gsm_tester/templates/osmo-bts-octphy.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-octphy.cfg.tmpl index 3548979..b816036 100644 --- a/src/osmo_gsm_tester/templates/osmo-bts-octphy.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bts-octphy.cfg.tmpl @@ -39,9 +39,9 @@ gsmtap-sapi sdcch gsmtap-sapi tch/f gsmtap-sapi tch/h - gsmtap-sapi pacch - gsmtap-sapi pdtch - gsmtap-sapi ptcch + !gsmtap-sapi pacch + !gsmtap-sapi pdtch + !gsmtap-sapi ptcch gsmtap-sapi cbch gsmtap-sapi sacch %for trx in osmo_bts_octphy.trx_list: diff --git a/src/osmo_gsm_tester/templates/osmo-bts-sysmo.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-sysmo.cfg.tmpl index 536e5cb..2533354 100644 --- a/src/osmo_gsm_tester/templates/osmo-bts-sysmo.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bts-sysmo.cfg.tmpl @@ -32,9 +32,9 @@ gsmtap-sapi sdcch gsmtap-sapi tch/f gsmtap-sapi tch/h - gsmtap-sapi pacch - gsmtap-sapi pdtch - gsmtap-sapi ptcch + !gsmtap-sapi pacch + !gsmtap-sapi pdtch + !gsmtap-sapi ptcch gsmtap-sapi cbch gsmtap-sapi sacch trx 0 diff --git a/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl index 2239f74..8a962a5 100644 --- a/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl @@ -44,9 +44,9 @@ gsmtap-sapi sdcch gsmtap-sapi tch/f gsmtap-sapi tch/h - gsmtap-sapi pacch - gsmtap-sapi pdtch - gsmtap-sapi ptcch + !gsmtap-sapi pacch + !gsmtap-sapi pdtch + !gsmtap-sapi ptcch gsmtap-sapi cbch gsmtap-sapi sacch %for chan in osmo_bts_trx.osmo_trx.channels: diff --git a/src/osmo_gsm_tester/templates/osmo-bts-virtual.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-virtual.cfg.tmpl index cb2e1ec..2276c86 100644 --- a/src/osmo_gsm_tester/templates/osmo-bts-virtual.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bts-virtual.cfg.tmpl @@ -35,9 +35,9 @@ gsmtap-sapi sdcch gsmtap-sapi tch/f gsmtap-sapi tch/h - gsmtap-sapi pacch - gsmtap-sapi pdtch - gsmtap-sapi ptcch + !gsmtap-sapi pacch + !gsmtap-sapi pdtch + !gsmtap-sapi ptcch gsmtap-sapi cbch gsmtap-sapi sacch trx 0 diff --git a/src/osmo_gsm_tester/templates/osmo-pcu-oc2g.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-pcu-oc2g.cfg.tmpl index 5c03636..0b1cd2d 100644 --- a/src/osmo_gsm_tester/templates/osmo-pcu-oc2g.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-pcu-oc2g.cfg.tmpl @@ -1,8 +1,13 @@ log stderr - logging color 1 - logging print extended-timestamp 1 - logging print category 1 - logging level set-all info + logging color 1 + logging print extended-timestamp 1 + logging print category 1 + logging print category-hex 0 + logging print file basename + logging level set-all info +line vty + no login + bind ${osmo_pcu_oc2g.bts_addr} pcu pcu-socket ${osmo_pcu_oc2g.pcu_socket_path} flow-control-interval 10 @@ -10,3 +15,17 @@ alloc-algorithm dynamic alpha 0 gamma 0 + gsmtap-category dl-unknown + !gsmtap-category dl-dummy + gsmtap-category dl-ctrl + gsmtap-category dl-data-gprs + gsmtap-category dl-data-egprs + gsmtap-category dl-ptcch + gsmtap-category dl-agch + gsmtap-category dl-pch + gsmtap-category ul-unknown + !gsmtap-category ul-dummy + gsmtap-category ul-ctrl + gsmtap-category ul-data-gprs + gsmtap-category ul-data-egprs + gsmtap-category ul-rach diff --git a/src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl index bcb3d7c..ea1a69a 100644 --- a/src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl @@ -1,8 +1,13 @@ log stderr - logging color 1 - logging print extended-timestamp 1 - logging print category 1 - logging level set-all info + logging color 1 + logging print extended-timestamp 1 + logging print category 1 + logging print category-hex 0 + logging print file basename + logging level set-all info +line vty + no login + bind ${osmo_pcu_sysmo.bts_addr} pcu pcu-socket ${osmo_pcu_sysmo.pcu_socket_path} flow-control-interval 10 @@ -10,3 +15,17 @@ alloc-algorithm dynamic alpha 0 gamma 0 + gsmtap-category dl-unknown + !gsmtap-category dl-dummy + gsmtap-category dl-ctrl + gsmtap-category dl-data-gprs + gsmtap-category dl-data-egprs + gsmtap-category dl-ptcch + gsmtap-category dl-agch + gsmtap-category dl-pch + gsmtap-category ul-unknown + !gsmtap-category ul-dummy + gsmtap-category ul-ctrl + gsmtap-category ul-data-gprs + gsmtap-category ul-data-egprs + gsmtap-category ul-rach diff --git a/src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl index da7425c..1d050c1 100644 --- a/src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl @@ -1,8 +1,13 @@ log stderr - logging color 1 - logging print extended-timestamp 1 - logging print category 1 - logging level set-all info + logging color 1 + logging print extended-timestamp 1 + logging print category 1 + logging print category-hex 0 + logging print file basename + logging level set-all info +line vty + no login + bind ${osmo_pcu.bts_addr} pcu pcu-socket ${osmo_pcu.pcu_socket_path} flow-control-interval 10 @@ -10,3 +15,17 @@ alloc-algorithm dynamic alpha 0 gamma 0 + gsmtap-category dl-unknown + !gsmtap-category dl-dummy + gsmtap-category dl-ctrl + gsmtap-category dl-data-gprs + gsmtap-category dl-data-egprs + gsmtap-category dl-ptcch + gsmtap-category dl-agch + gsmtap-category dl-pch + gsmtap-category ul-unknown + !gsmtap-category ul-dummy + gsmtap-category ul-ctrl + gsmtap-category ul-data-gprs + gsmtap-category ul-data-egprs + gsmtap-category ul-rach -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17737 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I506a39b114eed55a185d329cea5e9d6ba379a2ae Gerrit-Change-Number: 17737 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin at sysmocom.de> Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200406/d5a6b622/attachment.htm>