Build failure of network:osmocom:nightly/osmo-pcu in xUbuntu_16.04/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcu/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-pcu failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcu Last lines of build log: [ 287s] [397/417] installing util-linux-2.27.1-6ubuntu3 [ 288s] Processing triggers for mime-support (3.59ubuntu1) ... [ 288s] Processing triggers for man-db (2.7.5-1) ... [ 289s] [398/417] installing texlive-binaries-2015.20160222.37495-1 [ 291s] update-alternatives: using /usr/bin/xdvi-xaw to provide /usr/bin/xdvi.bin (xdvi.bin) in auto mode [ 291s] update-alternatives: using /usr/bin/bibtex.original to provide /usr/bin/bibtex (bibtex) in auto mode [ 291s] Processing triggers for install-info (6.1.0.dfsg.1-5) ... [ 291s] Processing triggers for man-db (2.7.5-1) ... [ 292s] Processing triggers for tex-common (6.04) ... [ 292s] update-language: texlive-base not installed and configured, doing nothing! [ 292s] texlive-base is not ready, skipping fmtutil-sys --all call [ 292s] [399/417] installing texlive-base-2015.20160320-1 [ 292s] dpkg-deb (subprocess): decompressing archive member: internal gzip read error: ': incorrect data check' [ 292s] tar: Unexpected EOF in archive [ 292s] tar: Unexpected EOF in archive [ 292s] tar: Error is not recoverable: exiting now [ 292s] dpkg-deb: error: subprocess tar returned error exit status 2 [ 292s] dpkg: error processing archive .init_b_cache/texlive-base.deb (--install): [ 292s] subprocess dpkg-deb --control returned error exit status 2 [ 292s] Errors were encountered while processing: [ 292s] .init_b_cache/texlive-base.deb [ 292s] exit ... [ 292s] ### VM INTERACTION START ### [ 296s] [ 270.625668] sysrq: SysRq : Power Off [ 296s] [ 270.637550] reboot: Power down [ 296s] ### VM INTERACTION END ### [ 296s] [ 296s] lamb02 failed "build osmo-pcu_0.8.0.88.e50c.dsc" at Wed Mar 25 01:39:57 UTC 2020. [ 296s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/)
Change in osmo-gsm-tester[master]: srs_ue: remove hard-coded num phy thread param
srs_andre has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17602 )
Change subject: srs_ue: remove hard-coded num phy thread param
..
srs_ue: remove hard-coded num phy thread param
Change-Id: Ia4fac188ecbe6aba393a68ec0291b51cd1441029
---
M src/osmo_gsm_tester/srs_ue.py
1 file changed, 0 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/src/osmo_gsm_tester/srs_ue.py b/src/osmo_gsm_tester/srs_ue.py
index 3764496..2dc5ddf 100644
--- a/src/osmo_gsm_tester/srs_ue.py
+++ b/src/osmo_gsm_tester/srs_ue.py
@@ -164,7 +164,6 @@
#'strace', '-ff',
args = (remote_binary, self.remote_config_file,
-'--phy.nof_phy_threads=1',
'--gw.netns=' + self.netns(),
'--log.filename=' + self.remote_log_file,
'--pcap.filename=' + self.remote_pcap_file,
@@ -200,7 +199,6 @@
util.create_netns(self.netns(), self.run_dir.new_dir('create_netns'))
args = (binary, os.path.abspath(self.config_file),
-'--phy.nof_phy_threads=1',
'--gw.netns=' + self.netns(),
'--log.filename=' + self.log_file,
'--pcap.filename=' + self.pcap_file,
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17602
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: Ia4fac188ecbe6aba393a68ec0291b51cd1441029
Gerrit-Change-Number: 17602
Gerrit-PatchSet: 1
Gerrit-Owner: srs_andre
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-Reviewer: srs_andre
Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: srs_enb: remove unneeded enb parameters
srs_andre has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17591 ) Change subject: srs_enb: remove unneeded enb parameters .. srs_enb: remove unneeded enb parameters Change-Id: I1f2e18c6552fc4a6e3a68d75a85744fadf26aacb --- M src/osmo_gsm_tester/srs_enb.py 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_gsm_tester/srs_enb.py b/src/osmo_gsm_tester/srs_enb.py index 364b3fd..b354408 100644 --- a/src/osmo_gsm_tester/srs_enb.py +++ b/src/osmo_gsm_tester/srs_enb.py @@ -154,8 +154,6 @@ '--enb_files.sib_config=' + self.remote_config_sib_file, '--enb_files.rr_config=' + self.remote_config_rr_file, '--enb_files.drb_config=' + self.remote_config_drb_file, -'--expert.nof_phy_threads=1', -'--expert.rrc_inactivity_timer=1500', '--log.filename=' + self.remote_log_file, '--pcap.filename=' + self.remote_pcap_file) @@ -180,8 +178,6 @@ '--enb_files.sib_config=' + os.path.abspath(self.config_sib_file), '--enb_files.rr_config=' + os.path.abspath(self.config_rr_file), '--enb_files.drb_config=' + os.path.abspath(self.config_drb_file), -'--expert.nof_phy_threads=1', -'--expert.rrc_inactivity_timer=1500', '--log.filename=' + self.log_file, '--pcap.filename=' + self.pcap_file) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17591 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: I1f2e18c6552fc4a6e3a68d75a85744fadf26aacb Gerrit-Change-Number: 17591 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: srs_enb: enable console trace, use RemoteProcess class
srs_andre has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17590 )
Change subject: srs_enb: enable console trace, use RemoteProcess class
..
srs_enb: enable console trace, use RemoteProcess class
In order for the console trace to work over SSH this commit
switches to use the default RemoteProcess class. Note that srsENB
now correctly handles the SIGHUP signal.
Change-Id: I26391eb8409e14b34987e0b338e10613fa157e06
---
M src/osmo_gsm_tester/srs_enb.py
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/src/osmo_gsm_tester/srs_enb.py b/src/osmo_gsm_tester/srs_enb.py
index ae9b12f..364b3fd 100644
--- a/src/osmo_gsm_tester/srs_enb.py
+++ b/src/osmo_gsm_tester/srs_enb.py
@@ -116,6 +116,10 @@
else:
self.start_locally()
+# send t+Enter to enable console trace
+self.dbg('Enabling console trace')
+self.process.stdin_write('t\n')
+
def start_remotely(self):
self.inst =
util.Dir(os.path.abspath(self.suite_run.trial.get_inst('srslte')))
lib = self.inst.child('lib')
@@ -155,7 +159,7 @@
'--log.filename=' + self.remote_log_file,
'--pcap.filename=' + self.remote_pcap_file)
-self.process =
self.rem_host.RemoteProcessFixIgnoreSIGHUP(srsENB.BINFILE,
util.Dir(srsENB.REMOTE_DIR), args, remote_env=remote_env)
+self.process = self.rem_host.RemoteProcess(srsENB.BINFILE, args,
remote_env=remote_env)
self.suite_run.remember_to_stop(self.process)
self.process.launch()
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17590
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: I26391eb8409e14b34987e0b338e10613fa157e06
Gerrit-Change-Number: 17590
Gerrit-PatchSet: 1
Gerrit-Owner: srs_andre
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-Reviewer: srs_andre
Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: defaults.conf: set num_carriers default value
srs_andre has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17603 ) Change subject: defaults.conf: set num_carriers default value .. defaults.conf: set num_carriers default value Change-Id: Ibe94fada0a40c499dd516408756c4ef7988ccec5 --- M example/defaults.conf 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/example/defaults.conf b/example/defaults.conf index b1fbfbb..2708b18 100644 --- a/example/defaults.conf +++ b/example/defaults.conf @@ -111,3 +111,4 @@ enable_pcap: false airplane_t_on_ms: -1 airplane_t_off_ms: -1 + num_carriers: 1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17603 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: Ibe94fada0a40c499dd516408756c4ef7988ccec5 Gerrit-Change-Number: 17603 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: srs_enb: remove num_cells getter
srs_andre has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17592 ) Change subject: srs_enb: remove num_cells getter .. srs_enb: remove num_cells getter Change-Id: Ic5c45bb17440d2ee241840591baf02930a0b3470 --- M src/osmo_gsm_tester/srs_enb.py 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_gsm_tester/srs_enb.py b/src/osmo_gsm_tester/srs_enb.py index b354408..772b447 100644 --- a/src/osmo_gsm_tester/srs_enb.py +++ b/src/osmo_gsm_tester/srs_enb.py @@ -251,9 +251,6 @@ def num_prb(self): return self._num_prb -def num_cells(self): -return self._num_cells - def num_ports(self): if self._txmode == 1: return 1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17592 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: Ic5c45bb17440d2ee241840591baf02930a0b3470 Gerrit-Change-Number: 17592 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-MessageType: merged
Change in libosmo-sccp[master]: doc: make sure all log categories are set to level notice
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/17597 ) Change subject: doc: make sure all log categories are set to level notice .. Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/libosmo-sccp/+/17597/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmo-sccp/+/17597/2//COMMIT_MSG@9 PS2, Line 9: Lets make sure all logging levels are set to notice Commit description doesn't match the commit changes. notive vs info. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/17597 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I3b17aa4354f30b55da8fc77f4fe6af0373de7983 Gerrit-Change-Number: 17597 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 24 Mar 2020 22:11:50 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-trx[master]: doc: switch log levels to notice
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/17594 ) Change subject: doc: switch log levels to notice .. Patch Set 1: I usually use osmo-trx with info level set and it looks good for me. I like seeing the clock indications to see that everything's smoothly. I'm not against the patch though, just sharing my opinion. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/17594 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ief82b85d9ff0e0e94eaabd255ebea961396fff32 Gerrit-Change-Number: 17594 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 24 Mar 2020 22:07:23 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-trx[master]: doc: do not set the base-port of the trx
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/17595 ) Change subject: doc: do not set the base-port of the trx .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/17595 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I105d1c51424836daa6893e83a81c83cc7ac6afd4 Gerrit-Change-Number: 17595 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 24 Mar 2020 22:08:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: defaults.conf: set num_carriers default value
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17603 ) Change subject: defaults.conf: set num_carriers default value .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17603 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: Ibe94fada0a40c499dd516408756c4ef7988ccec5 Gerrit-Change-Number: 17603 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 24 Mar 2020 22:02:08 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: srs_ue: remove hard-coded num phy thread param
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17602 ) Change subject: srs_ue: remove hard-coded num phy thread param .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17602 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: Ia4fac188ecbe6aba393a68ec0291b51cd1441029 Gerrit-Change-Number: 17602 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 24 Mar 2020 22:01:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: srs_enb: remove num_cells getter
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17592 ) Change subject: srs_enb: remove num_cells getter .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17592 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: Ic5c45bb17440d2ee241840591baf02930a0b3470 Gerrit-Change-Number: 17592 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 24 Mar 2020 22:01:31 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: srs_enb: enable console trace, use RemoteProcess class
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17590 ) Change subject: srs_enb: enable console trace, use RemoteProcess class .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17590 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: I26391eb8409e14b34987e0b338e10613fa157e06 Gerrit-Change-Number: 17590 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 24 Mar 2020 22:01:02 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: srs_enb: remove unneeded enb parameters
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17591 ) Change subject: srs_enb: remove unneeded enb parameters .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17591 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: I1f2e18c6552fc4a6e3a68d75a85744fadf26aacb Gerrit-Change-Number: 17591 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 24 Mar 2020 22:01:15 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: defaults.conf: set num_carriers default value
srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17603 ) Change subject: defaults.conf: set num_carriers default value .. defaults.conf: set num_carriers default value Change-Id: Ibe94fada0a40c499dd516408756c4ef7988ccec5 --- M example/defaults.conf 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/03/17603/1 diff --git a/example/defaults.conf b/example/defaults.conf index b1fbfbb..2708b18 100644 --- a/example/defaults.conf +++ b/example/defaults.conf @@ -111,3 +111,4 @@ enable_pcap: false airplane_t_on_ms: -1 airplane_t_off_ms: -1 + num_carriers: 1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17603 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: Ibe94fada0a40c499dd516408756c4ef7988ccec5 Gerrit-Change-Number: 17603 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-MessageType: newchange
Change in osmo-gsm-tester[master]: srs_ue: remove hard-coded num phy thread param
srs_andre has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17602 )
Change subject: srs_ue: remove hard-coded num phy thread param
..
srs_ue: remove hard-coded num phy thread param
Change-Id: Ia4fac188ecbe6aba393a68ec0291b51cd1441029
---
M src/osmo_gsm_tester/srs_ue.py
1 file changed, 0 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester
refs/changes/02/17602/1
diff --git a/src/osmo_gsm_tester/srs_ue.py b/src/osmo_gsm_tester/srs_ue.py
index 3764496..2dc5ddf 100644
--- a/src/osmo_gsm_tester/srs_ue.py
+++ b/src/osmo_gsm_tester/srs_ue.py
@@ -164,7 +164,6 @@
#'strace', '-ff',
args = (remote_binary, self.remote_config_file,
-'--phy.nof_phy_threads=1',
'--gw.netns=' + self.netns(),
'--log.filename=' + self.remote_log_file,
'--pcap.filename=' + self.remote_pcap_file,
@@ -200,7 +199,6 @@
util.create_netns(self.netns(), self.run_dir.new_dir('create_netns'))
args = (binary, os.path.abspath(self.config_file),
-'--phy.nof_phy_threads=1',
'--gw.netns=' + self.netns(),
'--log.filename=' + self.log_file,
'--pcap.filename=' + self.pcap_file,
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17602
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: Ia4fac188ecbe6aba393a68ec0291b51cd1441029
Gerrit-Change-Number: 17602
Gerrit-PatchSet: 1
Gerrit-Owner: srs_andre
Gerrit-MessageType: newchange
Change in osmo-ggsn[master]: doc: use 127.0.0.2 instead of 127.0.0.6 as bind ip.
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/17601 ) Change subject: doc: use 127.0.0.2 instead of 127.0.0.6 as bind ip. .. doc: use 127.0.0.2 instead of 127.0.0.6 as bind ip. The example config for osmo-sgsn suggests to use 127.0.0.6 as bind ip, this is a bit far off, lets use 127.0.0.2 instead. Change-Id: I513ab64896dee47fd92dbc5ef495fe1c6e734ec3 --- M doc/examples/osmo-ggsn.cfg 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/01/17601/1 diff --git a/doc/examples/osmo-ggsn.cfg b/doc/examples/osmo-ggsn.cfg index d3693e1..e1e5cbb 100644 --- a/doc/examples/osmo-ggsn.cfg +++ b/doc/examples/osmo-ggsn.cfg @@ -37,7 +37,7 @@ ! ggsn ggsn0 gtp state-dir /tmp - gtp bind-ip 127.0.0.6 + gtp bind-ip 127.0.0.2 apn internet gtpu-mode tun tun-device tun4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/17601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I513ab64896dee47fd92dbc5ef495fe1c6e734ec3 Gerrit-Change-Number: 17601 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange
Change in osmo-hlr[master]: doc: do not use loglevel info for log category ss
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/17600 ) Change subject: doc: do not use loglevel info for log category ss .. doc: do not use loglevel info for log category ss The log category ss uses info as loglevel vor ss, this is to verbose, lets use notice instead. Change-Id: I192a5f07cb7f45adb6f3af1c511b706738bdadf4 --- M doc/examples/osmo-hlr.cfg 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/00/17600/1 diff --git a/doc/examples/osmo-hlr.cfg b/doc/examples/osmo-hlr.cfg index a685858..dabfc8e 100644 --- a/doc/examples/osmo-hlr.cfg +++ b/doc/examples/osmo-hlr.cfg @@ -12,7 +12,7 @@ logging level main notice logging level db notice logging level auc notice - logging level ss info + logging level ss notice logging level linp error ! line vty -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/17600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I192a5f07cb7f45adb6f3af1c511b706738bdadf4 Gerrit-Change-Number: 17600 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange
Change in osmo-mgw[master]: doc: do not bind osmo-mgw to random ip-address
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/17599 ) Change subject: doc: do not bind osmo-mgw to random ip-address .. doc: do not bind osmo-mgw to random ip-address The example config bind the MGW to a random ip-address, lets use the loopback address here, this will suit cases where osmo-bts runs on the same machine as the MGW (nitb). For all other cases were an external BTS is used the ip-address still needs to be changed. Change-Id: Iae52c671c48953ea6b52b18c5d77347343cde0df --- M doc/examples/osmo-mgw/osmo-mgw.cfg 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/99/17599/1 diff --git a/doc/examples/osmo-mgw/osmo-mgw.cfg b/doc/examples/osmo-mgw/osmo-mgw.cfg index 3057369..dca858e 100644 --- a/doc/examples/osmo-mgw/osmo-mgw.cfg +++ b/doc/examples/osmo-mgw/osmo-mgw.cfg @@ -4,7 +4,7 @@ mgcp bind ip 127.0.0.1 rtp port-range 4002 16000 - rtp bind-ip 10.9.1.122 + rtp bind-ip 127.0.0.1 rtp ip-probing rtp ip-tos 184 bind port 2427 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/17599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iae52c671c48953ea6b52b18c5d77347343cde0df Gerrit-Change-Number: 17599 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange
Change in osmo-msc[master]: doc: do not use random ip-address for MGW
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/17598 ) Change subject: doc: do not use random ip-address for MGW .. doc: do not use random ip-address for MGW The example configs suggest to use a random ip-address as MGW address. Lets use a loopback address here. This will suit the usual case where MGW and MSC run together on the same machine. Change-Id: Ie2b2094fdcfed45353d9ba22cb07eed626fd143c --- M doc/examples/osmo-msc/osmo-msc.cfg M doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg M doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/98/17598/1 diff --git a/doc/examples/osmo-msc/osmo-msc.cfg b/doc/examples/osmo-msc/osmo-msc.cfg index f80143d..83b2c6f 100644 --- a/doc/examples/osmo-msc/osmo-msc.cfg +++ b/doc/examples/osmo-msc/osmo-msc.cfg @@ -13,7 +13,7 @@ rrlp mode none mm info 1 msc - mgw remote-ip 10.23.24.1 + mgw remote-ip 127.0.0.1 mgw remote-port 2427 mgw local-port 2728 assign-tmsi diff --git a/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg b/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg index 39ca9d4..d949ef9 100644 --- a/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg +++ b/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg @@ -21,7 +21,7 @@ msc cs7-instance-a 0 cs7-instance-iu 0 - mgw remote-ip 10.23.24.1 + mgw remote-ip 127.0.0.1 mgw remote-port 2427 mgw local-port 2728 assign-tmsi diff --git a/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg b/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg index 2af1726..cb1157d 100644 --- a/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg +++ b/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg @@ -23,7 +23,7 @@ msc cs7-instance-a 0 cs7-instance-iu 1 - mgw remote-ip 10.23.24.1 + mgw remote-ip 127.0.0.1 mgw remote-port 2427 mgw local-port 2728 assign-tmsi -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie2b2094fdcfed45353d9ba22cb07eed626fd143c Gerrit-Change-Number: 17598 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange
Change in libosmo-sccp[master]: doc: make sure all log categories are set to level notice
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/17597 to look at the new patch set (#2). Change subject: doc: make sure all log categories are set to level notice .. doc: make sure all log categories are set to level notice Lets make sure all logging levels are set to notice Change-Id: I3b17aa4354f30b55da8fc77f4fe6af0373de7983 --- M doc/examples/osmo-stp.cfg 1 file changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/97/17597/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/17597 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I3b17aa4354f30b55da8fc77f4fe6af0373de7983 Gerrit-Change-Number: 17597 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in libosmo-sccp[master]: doc: do not use logging level "debug" in example config
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/17597 ) Change subject: doc: do not use logging level "debug" in example config .. doc: do not use logging level "debug" in example config The example config for osmo-stp has some log categories set to debug. This is too verbose for an example config. Lets make sure all logging levels are set to notice Change-Id: I3b17aa4354f30b55da8fc77f4fe6af0373de7983 --- M doc/examples/osmo-stp.cfg 1 file changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/97/17597/1 diff --git a/doc/examples/osmo-stp.cfg b/doc/examples/osmo-stp.cfg index ed37672..bfdfc43 100644 --- a/doc/examples/osmo-stp.cfg +++ b/doc/examples/osmo-stp.cfg @@ -7,10 +7,7 @@ logging color 1 logging print category 1 logging timestamp 0 - logging level lss7 debug - logging level lsccp debug - logging level lsua debug - logging level lm3ua debug + logging level set-all info line vty no login ! -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/17597 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I3b17aa4354f30b55da8fc77f4fe6af0373de7983 Gerrit-Change-Number: 17597 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange
Change in osmo-trx[master]: doc: do not set the base-port of the trx
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/17595 ) Change subject: doc: do not set the base-port of the trx .. doc: do not set the base-port of the trx In current config files a base port for osmo-trx is set. Lets remove this setting so that compiled-in default (which is the same value) is used. Change-Id: I105d1c51424836daa6893e83a81c83cc7ac6afd4 --- M doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg M doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg M doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg M doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg 4 files changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/95/17595/1 diff --git a/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg b/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg index 58b27fb..6d787f6 100644 --- a/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg +++ b/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg @@ -12,7 +12,6 @@ trx bind-ip 127.0.0.1 remote-ip 127.0.0.1 - base-port 5700 egprs disable tx-sps 4 rx-sps 4 diff --git a/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg b/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg index 58b27fb..6d787f6 100644 --- a/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg +++ b/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg @@ -12,7 +12,6 @@ trx bind-ip 127.0.0.1 remote-ip 127.0.0.1 - base-port 5700 egprs disable tx-sps 4 rx-sps 4 diff --git a/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg b/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg index 3a99491..2e45da9 100644 --- a/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg +++ b/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg @@ -12,7 +12,6 @@ trx bind-ip 127.0.0.1 remote-ip 127.0.0.1 - base-port 5700 dev-args addr=192.168.10.2,pa=NONE,pa_power_max_dbm=23,fifo_ctrl_window=0,status_port=12345 egprs disable tx-sps 4 diff --git a/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg b/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg index a0c5078..e47d183 100644 --- a/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg +++ b/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg @@ -12,7 +12,6 @@ trx bind-ip 127.0.0.1 remote-ip 127.0.0.1 - base-port 5700 egprs disable tx-sps 4 rx-sps 4 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/17595 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I105d1c51424836daa6893e83a81c83cc7ac6afd4 Gerrit-Change-Number: 17595 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange
Change in osmo-trx[master]: doc: apply an rssi-offset of 28 by default.
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/17596 ) Change subject: doc: apply an rssi-offset of 28 by default. .. doc: apply an rssi-offset of 28 by default. Set an rssi offset of 28 in the example configs to make sure that the power control loop gets RSSI values that match at least half way the reality. Change-Id: I62725fe454f54e2c7cb7550dadb1e6fc94337d78 --- M doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/96/17596/1 diff --git a/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg b/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg index e47d183..3ba701b 100644 --- a/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg +++ b/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg @@ -13,6 +13,7 @@ bind-ip 127.0.0.1 remote-ip 127.0.0.1 egprs disable + rssi-offset 28.00 tx-sps 4 rx-sps 4 clock-ref external -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/17596 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I62725fe454f54e2c7cb7550dadb1e6fc94337d78 Gerrit-Change-Number: 17596 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange
Change in osmo-trx[master]: doc: switch log levels to notice
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/17594 ) Change subject: doc: switch log levels to notice .. doc: switch log levels to notice Some of the example configs have loglevels set to info. This is too verbose, lets make sure all loglevels are set to notice Change-Id: Ief82b85d9ff0e0e94eaabd255ebea961396fff32 --- M doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg M doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg M doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg M doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg 4 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/94/17594/1 diff --git a/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg b/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg index e2c67d6..58b27fb 100644 --- a/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg +++ b/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg @@ -4,7 +4,7 @@ logging print category 1 logging timestamp 1 logging print file basename - logging level set-all info + logging level set-all notice ! line vty no login diff --git a/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg b/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg index e2c67d6..58b27fb 100644 --- a/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg +++ b/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg @@ -4,7 +4,7 @@ logging print category 1 logging timestamp 1 logging print file basename - logging level set-all info + logging level set-all notice ! line vty no login diff --git a/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg b/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg index 1b15b47..3a99491 100644 --- a/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg +++ b/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg @@ -4,7 +4,7 @@ logging print category 1 logging timestamp 1 logging print file basename - logging level set-all info + logging level set-all notice ! line vty no login diff --git a/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg b/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg index 7d02506..a0c5078 100644 --- a/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg +++ b/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg @@ -4,7 +4,7 @@ logging print category 1 logging timestamp 1 logging print file basename - logging level set-all info + logging level set-all notice ! line vty no login -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/17594 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ief82b85d9ff0e0e94eaabd255ebea961396fff32 Gerrit-Change-Number: 17594 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange
Change in osmocom-bb[master]: mobile: add audio config, with unused audio loopback setting
Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/17593 to look at the new patch set (#2). Change subject: mobile: add audio config, with unused audio loopback setting .. mobile: add audio config, with unused audio loopback setting The aim is to add configurable audio loopback to mobile. An existing patch on a branch from fixeria [1] adds the audio config section. Add a reduced version of this audio config to be compatible with the future merge. Add the audio loopback setting, so far without functionality. Subsequent patch adds the actual loopback. [1] osmocom-bb branch fixeria/audio, patch "mobile/vty_interface.c: add new 'audio' section" Change-id I62cd5ef22ca2290fcafe65c78537ddbcb39fb8c6 Change-Id: Ie03e4a6c6f81ea3925266dd22e87506d722a6e1a --- M doc/examples/mobile/default.cfg M doc/examples/mobile/multi_ms.cfg M src/host/layer23/include/osmocom/bb/mobile/settings.h M src/host/layer23/include/osmocom/bb/mobile/vty.h M src/host/layer23/src/mobile/settings.c M src/host/layer23/src/mobile/vty_interface.c 6 files changed, 96 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/93/17593/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/17593 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie03e4a6c6f81ea3925266dd22e87506d722a6e1a Gerrit-Change-Number: 17593 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-MessageType: newpatchset
Change in osmocom-bb[master]: mobile: add audio config, with unused audio loopback setting
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/17593 ) Change subject: mobile: add audio config, with unused audio loopback setting .. Patch Set 1: @fixeria, I used your audio config section but tweaked to use a value string instead of a switch, I hope you agree with it -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/17593 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie03e4a6c6f81ea3925266dd22e87506d722a6e1a Gerrit-Change-Number: 17593 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Comment-Date: Tue, 24 Mar 2020 15:42:31 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmocom-bb[master]: mobile: loopback voice frames
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/17381 ) Change subject: mobile: loopback voice frames .. Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/17381 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Icd0b8d00c855db1a6ff5e35e10c8ff67b7ad5c83 Gerrit-Change-Number: 17381 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 24 Mar 2020 15:41:48 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmocom-bb[master]: mobile: add audio config, with unused audio loopback setting
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmocom-bb/+/17593 )
Change subject: mobile: add audio config, with unused audio loopback setting
..
mobile: add audio config, with unused audio loopback setting
The aim is to add configurable audio loopback to mobile. An existing patch on a
branch from fixeria [1] adds the audio config section. Add a reduced version of
this audio config to be compatible with the future merge.
Add the audio loopback setting, so far without functionality.
Subsequent patch adds the actual loopback.
[1] osmocom-bb branch fixeria/audio,
patch "mobile/vty_interface.c: add new 'audio' section"
Change-id I62cd5ef22ca2290fcafe65c78537ddbcb39fb8c6
Change-Id: Ie03e4a6c6f81ea3925266dd22e87506d722a6e1a
---
M doc/examples/mobile/default.cfg
M doc/examples/mobile/multi_ms.cfg
M src/host/layer23/include/osmocom/bb/mobile/settings.h
M src/host/layer23/include/osmocom/bb/mobile/vty.h
M src/host/layer23/src/mobile/settings.c
M src/host/layer23/src/mobile/vty_interface.c
6 files changed, 93 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/93/17593/1
diff --git a/doc/examples/mobile/default.cfg b/doc/examples/mobile/default.cfg
index cc81630..596a580 100644
--- a/doc/examples/mobile/default.cfg
+++ b/doc/examples/mobile/default.cfg
@@ -59,4 +59,6 @@
ki comp128 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
no barred-access
rplmn 001 01
+ audio
+ io-target none
no shutdown
diff --git a/doc/examples/mobile/multi_ms.cfg b/doc/examples/mobile/multi_ms.cfg
index bef2406..4735189 100644
--- a/doc/examples/mobile/multi_ms.cfg
+++ b/doc/examples/mobile/multi_ms.cfg
@@ -59,6 +59,8 @@
ki comp128 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
no barred-access
rplmn 001 01
+ audio
+ io-target none
no shutdown
!
ms two
@@ -109,4 +111,6 @@
ki comp128 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
no barred-access
rplmn 001 01
+ audio
+ io-target none
no shutdown
diff --git a/src/host/layer23/include/osmocom/bb/mobile/settings.h
b/src/host/layer23/include/osmocom/bb/mobile/settings.h
index 4e5d5a1..f4682d4 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/settings.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/settings.h
@@ -3,10 +3,29 @@
#define MOB_C7_DEFLT_ANY_TIMEOUT 30
+/* TCH frame I/O target */
+enum audio_io_target {
+ /* Nothing, don't care about TCH */
+ AUDIO_IO_NONE = 0,
+ /* Return to sender */
+ AUDIO_IO_LOOPBACK,
+};
+
+extern const struct value_string audio_io_target_names[];
+static inline const char *audio_io_target_name(enum audio_io_target val)
+{ return get_value_string(audio_io_target_names, val); }
+
+struct audio_settings {
+ enum audio_io_target io_target;
+};
+
struct gsm_settings {
charlayer2_socket_path[128];
charsap_socket_path[128];
+ /* Audio settings */
+ struct audio_settings audio;
+
/* IMEI */
charimei[16];
charimeisv[17];
diff --git a/src/host/layer23/include/osmocom/bb/mobile/vty.h
b/src/host/layer23/include/osmocom/bb/mobile/vty.h
index 3bec113..d066804 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/vty.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/vty.h
@@ -10,6 +10,7 @@
MS_NODE = _LAST_OSMOVTY_NODE + 1,
TESTSIM_NODE,
SUPPORT_NODE,
+ AUDIO_NODE,
};
int ms_vty_go_parent(struct vty *vty);
diff --git a/src/host/layer23/src/mobile/settings.c
b/src/host/layer23/src/mobile/settings.c
index 388c754..1898bbd 100644
--- a/src/host/layer23/src/mobile/settings.c
+++ b/src/host/layer23/src/mobile/settings.c
@@ -41,6 +41,9 @@
strcpy(set->layer2_socket_path, layer2_socket_path);
strcpy(set->sap_socket_path, sap_socket_path);
+ /* Audio settings */
+ set->audio.io_target = AUDIO_IO_NONE;
+
/* network search */
set->plmn_mode = PLMN_MODE_AUTO;
diff --git a/src/host/layer23/src/mobile/vty_interface.c
b/src/host/layer23/src/mobile/vty_interface.c
index 70ee703..fc9ec6f 100644
--- a/src/host/layer23/src/mobile/vty_interface.c
+++ b/src/host/layer23/src/mobile/vty_interface.c
@@ -65,6 +65,12 @@
1
};
+struct cmd_node audio_node = {
+ AUDIO_NODE,
+ "%s(audio)# ",
+ 1
+};
+
static void print_vty(void *priv, const char *fmt, ...)
{
char buffer[1000];
@@ -1526,6 +1532,16 @@
vty_out(vty, " c7-any-timeout %d%s",
set->any_timeout, VTY_NEWLINE);
+ vty_out(vty, " audio%s", VTY_NEWLINE);
+ switch (set->audio.io_target) {
+ case AUDIO_IO_NONE:
+ vty_out(vty, " no io-target%s", VTY_NEWLINE);
+ break;
+ default:
+ vty_out(vty, " io-target %s%s",
Change in osmo-gsm-tester[master]: srs_enb: remove num_cells getter
srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17592 ) Change subject: srs_enb: remove num_cells getter .. srs_enb: remove num_cells getter Change-Id: Ic5c45bb17440d2ee241840591baf02930a0b3470 --- M src/osmo_gsm_tester/srs_enb.py 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/92/17592/1 diff --git a/src/osmo_gsm_tester/srs_enb.py b/src/osmo_gsm_tester/srs_enb.py index b354408..772b447 100644 --- a/src/osmo_gsm_tester/srs_enb.py +++ b/src/osmo_gsm_tester/srs_enb.py @@ -251,9 +251,6 @@ def num_prb(self): return self._num_prb -def num_cells(self): -return self._num_cells - def num_ports(self): if self._txmode == 1: return 1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17592 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: Ic5c45bb17440d2ee241840591baf02930a0b3470 Gerrit-Change-Number: 17592 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-MessageType: newchange
Change in osmo-gsm-tester[master]: srs_enb: enable console trace, use RemoteProcess class
srs_andre has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17590 )
Change subject: srs_enb: enable console trace, use RemoteProcess class
..
srs_enb: enable console trace, use RemoteProcess class
In order for the console trace to work over SSH this commit
switches to use the default RemoteProcess class. Note that srsENB
now correctly handles the SIGHUP signal.
Change-Id: I26391eb8409e14b34987e0b338e10613fa157e06
---
M src/osmo_gsm_tester/srs_enb.py
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester
refs/changes/90/17590/1
diff --git a/src/osmo_gsm_tester/srs_enb.py b/src/osmo_gsm_tester/srs_enb.py
index ae9b12f..364b3fd 100644
--- a/src/osmo_gsm_tester/srs_enb.py
+++ b/src/osmo_gsm_tester/srs_enb.py
@@ -116,6 +116,10 @@
else:
self.start_locally()
+# send t+Enter to enable console trace
+self.dbg('Enabling console trace')
+self.process.stdin_write('t\n')
+
def start_remotely(self):
self.inst =
util.Dir(os.path.abspath(self.suite_run.trial.get_inst('srslte')))
lib = self.inst.child('lib')
@@ -155,7 +159,7 @@
'--log.filename=' + self.remote_log_file,
'--pcap.filename=' + self.remote_pcap_file)
-self.process =
self.rem_host.RemoteProcessFixIgnoreSIGHUP(srsENB.BINFILE,
util.Dir(srsENB.REMOTE_DIR), args, remote_env=remote_env)
+self.process = self.rem_host.RemoteProcess(srsENB.BINFILE, args,
remote_env=remote_env)
self.suite_run.remember_to_stop(self.process)
self.process.launch()
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17590
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: I26391eb8409e14b34987e0b338e10613fa157e06
Gerrit-Change-Number: 17590
Gerrit-PatchSet: 1
Gerrit-Owner: srs_andre
Gerrit-MessageType: newchange
Change in osmo-gsm-tester[master]: srs_enb: remove unneeded enb parameters
srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17591 ) Change subject: srs_enb: remove unneeded enb parameters .. srs_enb: remove unneeded enb parameters Change-Id: I1f2e18c6552fc4a6e3a68d75a85744fadf26aacb --- M src/osmo_gsm_tester/srs_enb.py 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/91/17591/1 diff --git a/src/osmo_gsm_tester/srs_enb.py b/src/osmo_gsm_tester/srs_enb.py index 364b3fd..b354408 100644 --- a/src/osmo_gsm_tester/srs_enb.py +++ b/src/osmo_gsm_tester/srs_enb.py @@ -154,8 +154,6 @@ '--enb_files.sib_config=' + self.remote_config_sib_file, '--enb_files.rr_config=' + self.remote_config_rr_file, '--enb_files.drb_config=' + self.remote_config_drb_file, -'--expert.nof_phy_threads=1', -'--expert.rrc_inactivity_timer=1500', '--log.filename=' + self.remote_log_file, '--pcap.filename=' + self.remote_pcap_file) @@ -180,8 +178,6 @@ '--enb_files.sib_config=' + os.path.abspath(self.config_sib_file), '--enb_files.rr_config=' + os.path.abspath(self.config_rr_file), '--enb_files.drb_config=' + os.path.abspath(self.config_drb_file), -'--expert.nof_phy_threads=1', -'--expert.rrc_inactivity_timer=1500', '--log.filename=' + self.log_file, '--pcap.filename=' + self.pcap_file) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17591 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: I1f2e18c6552fc4a6e3a68d75a85744fadf26aacb Gerrit-Change-Number: 17591 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-MessageType: newchange
Change in osmo-gsm-tester[master]: srs_enb: add num_cells param to srsENB
srs_andre has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17583 )
Change subject: srs_enb: add num_cells param to srsENB
..
srs_enb: add num_cells param to srsENB
this is needed to support the upcoming multi-cell feature in srsENB.
It's required for carrier aggregation (CA) but can also
be used for (currently) two independent 4G cells.
This commit adds baseline support for the parameter. Upcoming
commits will add hooks to configure the cell's EARFCN, etc.
Change-Id: I6d1658bf820163aee03b64b0f4ac68046c243f37
---
M example/defaults.conf
A example/scenarios/mod-enb-ncells@.conf
M src/osmo_gsm_tester/resource.py
M src/osmo_gsm_tester/srs_enb.py
M src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
5 files changed, 47 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/example/defaults.conf b/example/defaults.conf
index dcb84db..b1fbfbb 100644
--- a/example/defaults.conf
+++ b/example/defaults.conf
@@ -105,6 +105,7 @@
num_prb: 100
transmission_mode: 1
enable_pcap: false
+ num_cells: 1
srsue:
enable_pcap: false
diff --git a/example/scenarios/mod-enb-ncells@.conf
b/example/scenarios/mod-enb-ncells@.conf
new file mode 100644
index 000..b57b94a
--- /dev/null
+++ b/example/scenarios/mod-enb-ncells@.conf
@@ -0,0 +1,3 @@
+modifiers:
+ enb:
+ - num_cells: ${param1}
diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py
index 5862aef..3b805ff 100644
--- a/src/osmo_gsm_tester/resource.py
+++ b/src/osmo_gsm_tester/resource.py
@@ -90,6 +90,7 @@
'enb[].addr': schema.IPV4,
'enb[].num_prb': schema.UINT,
'enb[].transmission_mode': schema.LTE_TRANSMISSION_MODE,
+'enb[].num_cells': schema.UINT,
'enb[].rf_dev_type': schema.STR,
'enb[].rf_dev_args': schema.STR,
'arfcn[].arfcn': schema.INT,
diff --git a/src/osmo_gsm_tester/srs_enb.py b/src/osmo_gsm_tester/srs_enb.py
index 940665e..c4c72bc 100644
--- a/src/osmo_gsm_tester/srs_enb.py
+++ b/src/osmo_gsm_tester/srs_enb.py
@@ -201,6 +201,8 @@
assert self._num_prb
self._txmode = int(values['enb'].get('transmission_mode', None))
assert self._txmode
+self._num_cells = int(values['enb'].get('num_cells', None))
+assert self._num_cells
config.overlay(values, dict(enb={ 'num_ports': self.num_ports() }))
# We need to set some specific variables programatically here to match
IP addresses:
@@ -248,6 +250,9 @@
def num_prb(self):
return self._num_prb
+def num_cells(self):
+return self._num_cells
+
def num_ports(self):
if self._txmode == 1:
return 1
diff --git a/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
b/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
index 3dd3fee..2d31c3d 100644
--- a/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
+++ b/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
@@ -86,5 +86,42 @@
rsrq_config = 4;
};
}
+% if enb.get('num_cells') == '2':
+ ,
+ {
+rf_port = 1;
+cell_id = 0x02;
+tac = 0x0002;
+pci = 2;
+root_seq_idx = 205;
+dl_earfcn = 2910;
+ul_earfcn = 20910;
+ho_active = false;
+
+// CA cells
+scell_list = (
+ {cell_id = 0x01; cross_carrier_scheduling = false; scheduling_cell_id =
0x01; ul_allowed = true}
+)
+
+// Cells available for handover
+meas_cell_list =
+(
+ {
+eci = 0x19C02;
+dl_earfcn = 2850;
+pci = 1;
+ }
+);
+
+// ReportCfg (only A3 supported)
+meas_report_desc = {
+ a3_report_type = "RSRP";
+ a3_offset = 6;
+ a3_hysteresis = 0;
+ a3_time_to_trigger = 480;
+ rsrq_config = 4;
+};
+ }
+% endif
// Add here more cells
);
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17583
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: I6d1658bf820163aee03b64b0f4ac68046c243f37
Gerrit-Change-Number: 17583
Gerrit-PatchSet: 2
Gerrit-Owner: srs_andre
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-Reviewer: srs_andre
Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: srs_ue: adding num_carriers paramter and corresponding modifier
srs_andre has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17585 )
Change subject: srs_ue: adding num_carriers paramter and corresponding modifier
..
srs_ue: adding num_carriers paramter and corresponding modifier
this allows to configure a UE to support multiple carriers
Change-Id: I4fa0a0c6e52efb17aa0b07e55abb5470d8028e8b
---
A example/scenarios/mod-srsue-ncarriers@.conf
M src/osmo_gsm_tester/resource.py
M src/osmo_gsm_tester/templates/srsue.conf.tmpl
3 files changed, 15 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/example/scenarios/mod-srsue-ncarriers@.conf
b/example/scenarios/mod-srsue-ncarriers@.conf
new file mode 100644
index 000..bb6409a
--- /dev/null
+++ b/example/scenarios/mod-srsue-ncarriers@.conf
@@ -0,0 +1,3 @@
+modifiers:
+ modem:
+ - num_carriers: ${param1}
diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py
index 3b805ff..bb44f39 100644
--- a/src/osmo_gsm_tester/resource.py
+++ b/src/osmo_gsm_tester/resource.py
@@ -108,6 +108,7 @@
'modem[].features[]': schema.MODEM_FEATURE,
'modem[].rf_dev_type': schema.STR,
'modem[].rf_dev_args': schema.STR,
+'modem[].num_carriers': schema.STR,
'modem[].airplane_t_on_ms': schema.INT,
'modem[].airplane_t_off_ms': schema.INT,
'osmocon_phone[].serial_device': schema.STR,
diff --git a/src/osmo_gsm_tester/templates/srsue.conf.tmpl
b/src/osmo_gsm_tester/templates/srsue.conf.tmpl
index 12081c5..90925b3 100644
--- a/src/osmo_gsm_tester/templates/srsue.conf.tmpl
+++ b/src/osmo_gsm_tester/templates/srsue.conf.tmpl
@@ -31,13 +31,18 @@
# Default is auto (yes for UHD, no for rest)
#
[rf]
-dl_earfcn = 3400
+% if ue.num_carriers == 2:
+dl_earfcn = 2850,3050
+% else:
+dl_earfcn = 2850
+% endif
freq_offset = 0
tx_gain = 80
#rx_gain = 40
#nof_radios = 1
nof_antennas = ${ue.num_antennas}
+nof_carriers = ${ue.num_carriers}
device_name = ${ue.rf_dev_type}
@@ -138,8 +143,13 @@
# mbms_service_port: Port of the MBMS service
#
[rrc]
+% if ue.num_carriers == 2:
+ue_category = 7
+release = 10
+% else:
#ue_category = 4
#release = 8
+% endif
#feature_group = 0xe6041000
#mbms_service_id = -1
#mbms_service_port = 4321
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17585
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: I4fa0a0c6e52efb17aa0b07e55abb5470d8028e8b
Gerrit-Change-Number: 17585
Gerrit-PatchSet: 1
Gerrit-Owner: srs_andre
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-Reviewer: srs_andre
Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: srs_{enb, ue}: add secondary cell and set dl/ul freq in eNB/UE config ...
srs_andre has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17586 )
Change subject: srs_{enb,ue}: add secondary cell and set dl/ul freq in eNB/UE
config accordingly
..
srs_{enb,ue}: add secondary cell and set dl/ul freq in eNB/UE config accordingly
Change-Id: I3730856003fffda4f3c3f9e835d62ddc312c4c31
---
M src/osmo_gsm_tester/srs_enb.py
M src/osmo_gsm_tester/srs_ue.py
M src/osmo_gsm_tester/templates/srsenb.conf.tmpl
M src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
4 files changed, 6 insertions(+), 5 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/src/osmo_gsm_tester/srs_enb.py b/src/osmo_gsm_tester/srs_enb.py
index c4c72bc..ae9b12f 100644
--- a/src/osmo_gsm_tester/srs_enb.py
+++ b/src/osmo_gsm_tester/srs_enb.py
@@ -213,6 +213,7 @@
+ ',tx_port2=tcp://' + self.addr() + ':2002' \
+ ',rx_port=tcp://' + self.ue.addr() + ':2001' \
+ ',rx_port2=tcp://' + self.ue.addr() + ':2003' \
++
',tx_freq=2630e6,rx_freq=2510e6,tx_freq2=2650e6,rx_freq2=2530e6' \
+ ',id=enb,base_srate=' + str(base_srate)
config.overlay(values, dict(enb=dict(rf_dev_args=rf_dev_args)))
diff --git a/src/osmo_gsm_tester/srs_ue.py b/src/osmo_gsm_tester/srs_ue.py
index fdcd6dd..3764496 100644
--- a/src/osmo_gsm_tester/srs_ue.py
+++ b/src/osmo_gsm_tester/srs_ue.py
@@ -234,6 +234,7 @@
+
',tx_port2=tcp://' + self.addr() + ':2003' \
+
',rx_port=tcp://' + self.enb.addr() + ':2000' \
+
',rx_port2=tcp://' + self.enb.addr() + ':2002' \
++
',tx_freq=2510e6,rx_freq=2630e6,tx_freq2=2530e6,rx_freq2=2650e6' \
+
',id=ue,base_srate='+ str(base_srate)
)))
diff --git a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl
b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl
index d16f9d1..954b63f 100644
--- a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl
+++ b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl
@@ -63,7 +63,6 @@
# Default "auto". B210 USRP: 400 us, bladeRF: 0 us.
#
[rf]
-dl_earfcn = 3400
tx_gain = 80
rx_gain = 40
diff --git a/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
b/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
index 2d31c3d..cd9f4aa 100644
--- a/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
+++ b/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
@@ -58,8 +58,8 @@
tac = 0x0001;
pci = 1;
// root_seq_idx = 204;
-dl_earfcn = 3400;
-//ul_earfcn = 21400;
+dl_earfcn = 2850;
+//ul_earfcn = 20850;
ho_active = false;
// CA cells
@@ -94,8 +94,8 @@
tac = 0x0002;
pci = 2;
root_seq_idx = 205;
-dl_earfcn = 2910;
-ul_earfcn = 20910;
+dl_earfcn = 3050;
+//ul_earfcn = 21050;
ho_active = false;
// CA cells
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17586
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: I3730856003fffda4f3c3f9e835d62ddc312c4c31
Gerrit-Change-Number: 17586
Gerrit-PatchSet: 1
Gerrit-Owner: srs_andre
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-Reviewer: srs_andre
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: pcu: cosmetic: fix formatting of 'execute' statements
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17589 ) Change subject: pcu: cosmetic: fix formatting of 'execute' statements .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17589 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia5a0eca1be13cc6580329b272ed9f663938f1e60 Gerrit-Change-Number: 17589 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 24 Mar 2020 14:28:44 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: VTY: add show bts failure report
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/17571 ) Change subject: VTY: add show bts failure report .. Patch Set 3: Code-Review-1 (4 comments) https://gerrit.osmocom.org/c/osmo-bsc/+/17571/3/src/osmo-bsc/abis_nm.c File src/osmo-bsc/abis_nm.c: https://gerrit.osmocom.org/c/osmo-bsc/+/17571/3/src/osmo-bsc/abis_nm.c@421 PS3, Line 421: entry->mb = msgb_copy_c(entry, mb, "OML failure report"); copy_c? is this going to be freed after mainloop iteration? https://gerrit.osmocom.org/c/osmo-bsc/+/17571/3/src/osmo-bsc/abis_nm.c@422 PS3, Line 422: list = >oml_fail_rep; Drop this variable, it makes stuff more confusing that helping, since later on it's confusing with the "list" attribute of "struct bts_oml_fail_rep". https://gerrit.osmocom.org/c/osmo-bsc/+/17571/3/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/17571/3/src/osmo-bsc/bsc_vty.c@579 PS3, Line 579: list = >oml_fail_rep; Again, drop this variable. https://gerrit.osmocom.org/c/osmo-bsc/+/17571/3/src/osmo-bsc/bsc_vty.c@606 PS3, Line 606: When is this list cleared or getting smaller? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/17571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I18aa17a721cd5eb1c98926dc2367229c0a50bc78 Gerrit-Change-Number: 17571 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 24 Mar 2020 14:27:55 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pcu: cosmetic: fix formatting of 'execute' statements
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17589 ) Change subject: pcu: cosmetic: fix formatting of 'execute' statements .. pcu: cosmetic: fix formatting of 'execute' statements Change-Id: Ia5a0eca1be13cc6580329b272ed9f663938f1e60 --- M pcu/PCU_Tests_RAW.ttcn 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/89/17589/1 diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn index 2564617..505592c 100644 --- a/pcu/PCU_Tests_RAW.ttcn +++ b/pcu/PCU_Tests_RAW.ttcn @@ -1530,10 +1530,10 @@ execute( TC_mt_ping_pong_with_dl_racap() ); execute( TC_imm_ass_dl_block_retrans() ); execute( TC_paging_cs_from_bts() ); - execute (TC_paging_cs_from_sgsn_sign() ); - execute (TC_paging_cs_from_sgsn_ptp() ); - execute (TC_paging_ps_from_sgsn_sign() ); - execute (TC_paging_ps_from_sgsn_ptp() ); + execute( TC_paging_cs_from_sgsn_sign() ); + execute( TC_paging_cs_from_sgsn_ptp() ); + execute( TC_paging_ps_from_sgsn_sign() ); + execute( TC_paging_ps_from_sgsn_ptp() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17589 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia5a0eca1be13cc6580329b272ed9f663938f1e60 Gerrit-Change-Number: 17589 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
Change in osmo-bsc[master]: abis_nm: move fail report parsing to extra func
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/17588 ) Change subject: abis_nm: move fail report parsing to extra func .. Patch Set 1: Code-Review-1 (3 comments) https://gerrit.osmocom.org/c/osmo-bsc/+/17588/1/src/osmo-bsc/abis_nm.c File src/osmo-bsc/abis_nm.c: https://gerrit.osmocom.org/c/osmo-bsc/+/17588/1/src/osmo-bsc/abis_nm.c@369 PS1, Line 369: tp = talloc(sd, struct tlv_parsed); Can we simply have a struct tlv_parsed instead of a pointer inside struct nm_fail_rep_signal_data? This way we get rid of one extra alloc+free. https://gerrit.osmocom.org/c/osmo-bsc/+/17588/1/src/osmo-bsc/abis_nm.c@372 PS1, Line 372: abis_nm_tlv_parse(tp, bts, foh->data, oh->length-sizeof(*foh)); no error checking? https://gerrit.osmocom.org/c/osmo-bsc/+/17588/1/src/osmo-bsc/abis_nm.c@394 PS1, Line 394: sd->parsed.event_type = ""; Here you are making it point to a stack-allocated buffer. That's not probably what you want. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/17588 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia51004faf620aa4d40435d58c70d758c9d0054d8 Gerrit-Change-Number: 17588 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 24 Mar 2020 14:21:19 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: srs_enb: enable console trace, use RemoteProcess class and fix params
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17587 ) Change subject: srs_enb: enable console trace, use RemoteProcess class and fix params .. Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17587/1/src/osmo_gsm_tester/srs_enb.py File src/osmo_gsm_tester/srs_enb.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17587/1/src/osmo_gsm_tester/srs_enb.py@a179 PS1, Line 179: '--expert.nof_phy_threads=1', This should go ideally into a separate patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17587 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: If5af43effa9145b6764a32557a20a2e1760f0486 Gerrit-Change-Number: 17587 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 24 Mar 2020 14:15:23 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: ms: add optional param to specify fixed APN IP address assigned to a MS
srs_andre has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17582 )
Change subject: ms: add optional param to specify fixed APN IP address assigned
to a MS
..
ms: add optional param to specify fixed APN IP address assigned to a MS
this allows to specify a fixed APN address for each subscriber in the
HLR. If the param is not provided in the resources config, the default
allocation type is used, which is to dynamically allocate an IP in the
supported range.
Change-Id: Ie6fcd7987dc7bc62a686bee3a10c67e3dd813419
---
M src/osmo_gsm_tester/modem.py
M src/osmo_gsm_tester/ms.py
M src/osmo_gsm_tester/resource.py
M src/osmo_gsm_tester/srs_epc.py
M src/osmo_gsm_tester/templates/srsepc_user_db.csv.tmpl
5 files changed, 12 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/src/osmo_gsm_tester/modem.py b/src/osmo_gsm_tester/modem.py
index f8a9245..a1e5e97 100644
--- a/src/osmo_gsm_tester/modem.py
+++ b/src/osmo_gsm_tester/modem.py
@@ -367,6 +367,7 @@
self.dbg('creating from syspath %s' % self.syspath)
self._ki = None
self._imsi = None
+self._apn_ipaddr = None
self.run_dir =
util.Dir(suite_run.get_test_run_dir().new_dir(self.name().strip('/')))
self.sms_received_list = []
self.dbus = ModemDbusInteraction(self.dbuspath)
@@ -467,6 +468,11 @@
return self._ki
return super().ki()
+def apn_ipaddr(self):
+if self._apn_ipaddr is not None:
+return self._apn_ipaddr
+return 'dynamic'
+
def features(self):
return self._conf.get('features', [])
diff --git a/src/osmo_gsm_tester/ms.py b/src/osmo_gsm_tester/ms.py
index 222a078..3276aff 100644
--- a/src/osmo_gsm_tester/ms.py
+++ b/src/osmo_gsm_tester/ms.py
@@ -34,6 +34,9 @@
def ki(self):
return self._conf.get('ki')
+def apn_ipaddr(self):
+return self._conf.get('apn_ipaddr', 'dynamic')
+
def auth_algo(self):
return self._conf.get('auth_algo', None)
diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py
index 757a9c5..5862aef 100644
--- a/src/osmo_gsm_tester/resource.py
+++ b/src/osmo_gsm_tester/resource.py
@@ -100,6 +100,7 @@
'modem[].imsi': schema.IMSI,
'modem[].ki': schema.KI,
'modem[].auth_algo': schema.AUTH_ALGO,
+'modem[].apn_ipaddr': schema.IPV4,
'modem[].remote_user': schema.STR,
'modem[].addr': schema.IPV4,
'modem[].ciphers[]': schema.CIPHER,
diff --git a/src/osmo_gsm_tester/srs_epc.py b/src/osmo_gsm_tester/srs_epc.py
index 0d020bc..947eb7b 100644
--- a/src/osmo_gsm_tester/srs_epc.py
+++ b/src/osmo_gsm_tester/srs_epc.py
@@ -199,7 +199,7 @@
raise log.Error("Auth algo %r selected but no KI specified" %
algo_str)
subscriber_id = len(self.subscriber_list) # list index
-self.subscriber_list.append({'id': subscriber_id, 'imsi':
modem.imsi(), 'msisdn': msisdn, 'auth_algo': algo_str, 'ki': modem.ki(), 'opc':
None})
+self.subscriber_list.append({'id': subscriber_id, 'imsi':
modem.imsi(), 'msisdn': msisdn, 'auth_algo': algo_str, 'ki': modem.ki(), 'opc':
None, 'apn_ipaddr': modem.apn_ipaddr()})
self.log('Add subscriber', msisdn=msisdn, imsi=modem.imsi(),
subscriber_id=subscriber_id,
algo_str=algo_str)
diff --git a/src/osmo_gsm_tester/templates/srsepc_user_db.csv.tmpl
b/src/osmo_gsm_tester/templates/srsepc_user_db.csv.tmpl
index c213e53..5b970bf 100644
--- a/src/osmo_gsm_tester/templates/srsepc_user_db.csv.tmpl
+++ b/src/osmo_gsm_tester/templates/srsepc_user_db.csv.tmpl
@@ -20,5 +20,5 @@
#ue2,mil,001010123456780,00112233445566778899aabbccddeeff,opc,63bfa50ee6523365ff14c1f45f88737d,8000,1234,7,dynamic
#ue1,xor,001010123456789,00112233445566778899aabbccddeeff,opc,63bfa50ee6523365ff14c1f45f88737d,9001,1255,7,dynamic
%for sub in epc.hss.subscribers:
-ogt${sub.id},${sub.auth_algo},${sub.imsi},${sub.ki},opc,63bfa50ee6523365ff14c1f45f88737d,8000,1234,${sub.qci},dynamic
+ogt${sub.id},${sub.auth_algo},${sub.imsi},${sub.ki},opc,63bfa50ee6523365ff14c1f45f88737d,8000,1234,${sub.qci},${sub.apn_ipaddr}
%endfor
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17582
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: Ie6fcd7987dc7bc62a686bee3a10c67e3dd813419
Gerrit-Change-Number: 17582
Gerrit-PatchSet: 2
Gerrit-Owner: srs_andre
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-Reviewer: srs_andre
Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: srs_{enb, ue}: add secondary cell and set dl/ul freq in eNB/UE config ...
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17586 )
Change subject: srs_{enb,ue}: add secondary cell and set dl/ul freq in eNB/UE
config accordingly
..
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17586
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: I3730856003fffda4f3c3f9e835d62ddc312c4c31
Gerrit-Change-Number: 17586
Gerrit-PatchSet: 1
Gerrit-Owner: srs_andre
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-Comment-Date: Tue, 24 Mar 2020 14:12:54 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: srs_{enb, ue}: add secondary cell and set dl/ul freq in eNB/UE config ...
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17586 )
Change subject: srs_{enb,ue}: add secondary cell and set dl/ul freq in eNB/UE
config accordingly
..
Patch Set 1: Code-Review+1
(1 comment)
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17586/1/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
File src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl:
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17586/1/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl@62
PS1, Line 62: //ul_earfcn = 20850;
Is this meant to be kept commented out?
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17586
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: I3730856003fffda4f3c3f9e835d62ddc312c4c31
Gerrit-Change-Number: 17586
Gerrit-PatchSet: 1
Gerrit-Owner: srs_andre
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-Comment-Date: Tue, 24 Mar 2020 14:12:50 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: srs_ue: adding num_carriers paramter and corresponding modifier
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17585 ) Change subject: srs_ue: adding num_carriers paramter and corresponding modifier .. Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17585/1/src/osmo_gsm_tester/templates/srsue.conf.tmpl File src/osmo_gsm_tester/templates/srsue.conf.tmpl: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17585/1/src/osmo_gsm_tester/templates/srsue.conf.tmpl@146 PS1, Line 146: % if ue.num_carriers == 2: We should at some point stop using so many conditionals and simply providing values, but fine for now. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17585 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: I4fa0a0c6e52efb17aa0b07e55abb5470d8028e8b Gerrit-Change-Number: 17585 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 24 Mar 2020 14:10:26 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: srs_enb: add num_cells param to srsENB
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17583 )
Change subject: srs_enb: add num_cells param to srsENB
..
Patch Set 2: Code-Review+2
(2 comments)
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17583/2/src/osmo_gsm_tester/srs_enb.py
File src/osmo_gsm_tester/srs_enb.py:
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17583/2/src/osmo_gsm_tester/srs_enb.py@253
PS2, Line 253: def num_cells(self):
Avoid adding getter for no good reason if nobody's going to use them. Let's try
keeping the APIs at the minimum necessary so that other object implementation
don't need to provide them too later.
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17583/2/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
File src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl:
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17583/2/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl@89
PS2, Line 89: % if enb.get('num_cells') == '2':
We could change all this into a for loop at some point. Fyi counter of the loop
is available as ${loop.index}. Eg:
%for trx in osmo_bts_octphy.trx_list:
trx ${loop.index}
%endfor
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17583
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: I6d1658bf820163aee03b64b0f4ac68046c243f37
Gerrit-Change-Number: 17583
Gerrit-PatchSet: 2
Gerrit-Owner: srs_andre
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-Comment-Date: Tue, 24 Mar 2020 14:09:11 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: ms: add optional param to specify fixed APN IP address assigned to a MS
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17582 ) Change subject: ms: add optional param to specify fixed APN IP address assigned to a MS .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17582 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: Ie6fcd7987dc7bc62a686bee3a10c67e3dd813419 Gerrit-Change-Number: 17582 Gerrit-PatchSet: 2 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 24 Mar 2020 14:05:09 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmocom-bb[master]: layer23/l1ctl: fix: do not pass PDCH and CBCH frames to LAPDm
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/17493 )
Change subject: layer23/l1ctl: fix: do not pass PDCH and CBCH frames to LAPDm
..
layer23/l1ctl: fix: do not pass PDCH and CBCH frames to LAPDm
GPRS (PDCH) and CBCH related frames have nothing to do with LAPDm.
The former uses LLC for the user-plane data, while CBCH involves
its own segmentation described in 3GPP TS 23.041 and TS 44.012.
There is currently no code for handling these kinds of frames, so
let's just send them to GSMTAP and release the memory (msgb).
Change-Id: I59b4acbe22217f8989f73b79b128a43e8bcdfa2f
Related: OS#4439
---
M src/host/layer23/src/common/l1ctl.c
1 file changed, 10 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/host/layer23/src/common/l1ctl.c
b/src/host/layer23/src/common/l1ctl.c
index b6ee455..b7d0ecd 100644
--- a/src/host/layer23/src/common/l1ctl.c
+++ b/src/host/layer23/src/common/l1ctl.c
@@ -319,6 +319,16 @@
dl->snr, ccch->data, sizeof(ccch->data));
}
+ /* Do not pass PDCH and CBCH frames to LAPDm */
+ switch (chan_type) {
+ case RSL_CHAN_OSMO_PDCH:
+ case RSL_CHAN_OSMO_CBCH4:
+ case RSL_CHAN_OSMO_CBCH8:
+ /* TODO: pass directly to l23 application */
+ msgb_free(msg);
+ return 0;
+ }
+
/* determine LAPDm entity based on SACCH or not */
if (dl->link_id & 0x40)
le = >lapdm_channel.lapdm_acch;
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/17493
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I59b4acbe22217f8989f73b79b128a43e8bcdfa2f
Gerrit-Change-Number: 17493
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmocom-bb[master]: layer23/l1ctl: fix: do not pass PDCH and CBCH frames to LAPDm
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/17493 ) Change subject: layer23/l1ctl: fix: do not pass PDCH and CBCH frames to LAPDm .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/17493 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I59b4acbe22217f8989f73b79b128a43e8bcdfa2f Gerrit-Change-Number: 17493 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 24 Mar 2020 13:52:52 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: VTY: add show bts failure report
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/17571 ) Change subject: VTY: add show bts failure report .. Patch Set 3: (1 comment) > Patch Set 2: > > (1 comment) > > I find the implementation a bit "inteeresting" in that it neither > > a) uses the raw input data and stores that, only generating strings during > "show" time, nor > b) reuses the existing libosmocore/strrb.c code for ring-buffers of strings. > > I would say that either we store the raw/binary report data in some custom > structure, but if we convert everything into strings at the time the alarm > happens, then I would expect strrb.c to be usable? Thanks for the review. Patch rewritten to store the raw msgb and parse it again when running the "show" command. https://gerrit.osmocom.org/c/osmo-bsc/+/17571/2/src/osmo-bsc/osmo_bsc_main.c File src/osmo-bsc/osmo_bsc_main.c: https://gerrit.osmocom.org/c/osmo-bsc/+/17571/2/src/osmo-bsc/osmo_bsc_main.c@220 PS2, Line 220: entry = talloc_zero(fail_rep->bts, struct bts_oml_fail_rep); > please either return NULL if talloc fails, or OSMO_ASSERT() on the result. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/17571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I18aa17a721cd5eb1c98926dc2367229c0a50bc78 Gerrit-Change-Number: 17571 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 24 Mar 2020 13:47:46 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment
Change in osmo-bsc[master]: VTY: add show bts failure report
Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/17571 to look at the new patch set (#3). Change subject: VTY: add show bts failure report .. VTY: add show bts failure report Save OML failure reports from each BTS. Add a VTY command to display them conveniently. OsmoBSC> show bts 0 fail-rep [2020-03-23 14:51:22] Type=processing failure, Severity=minor failure, Probable cause=Manufacturer specific values: Software warning, Additional text=test message sent from VTY [2020-03-23 14:51:19] Type=processing failure, Severity=minor failure, Probable cause=Manufacturer specific values: Software warning, Additional text=test message sent from VTY Related: OS#1605 Change-Id: I18aa17a721cd5eb1c98926dc2367229c0a50bc78 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/abis_nm.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/gsm_data.c 4 files changed, 75 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/71/17571/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/17571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I18aa17a721cd5eb1c98926dc2367229c0a50bc78 Gerrit-Change-Number: 17571 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-MessageType: newpatchset
Change in osmo-bsc[master]: abis_nm: move fail report parsing to extra func
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bsc/+/17588 )
Change subject: abis_nm: move fail report parsing to extra func
..
abis_nm: move fail report parsing to extra func
Separate raw input parsing from handling the failure report. A follow-up
patch will use the new parsing function to print saved failure reports
to the VTY.
Related: OS#1605
Change-Id: Ia51004faf620aa4d40435d58c70d758c9d0054d8
---
M include/osmocom/bsc/abis_nm.h
M src/osmo-bsc/abis_nm.c
2 files changed, 59 insertions(+), 40 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/88/17588/1
diff --git a/include/osmocom/bsc/abis_nm.h b/include/osmocom/bsc/abis_nm.h
index 45bbe2c..83bc2f8 100644
--- a/include/osmocom/bsc/abis_nm.h
+++ b/include/osmocom/bsc/abis_nm.h
@@ -27,6 +27,7 @@
#include
#include
+#include
/* max number of attributes represented as 3GPP TS 52.021 §9.4.62 SW
Description array */
#define MAX_BTS_ATTR 5
@@ -170,6 +171,8 @@
int abis_nm_select_newest_sw(const struct abis_nm_sw_desc *sw, const size_t
len);
+struct nm_fail_rep_signal_data *abis_nm_fail_evt_rep_parse(struct msgb *mb,
struct gsm_bts *bts);
+
/* Helper functions for updating attributes */
int abis_nm_update_max_power_red(struct gsm_bts_trx *trx);
diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c
index 2d181e8..01249b4 100644
--- a/src/osmo-bsc/abis_nm.c
+++ b/src/osmo-bsc/abis_nm.c
@@ -353,38 +353,72 @@
};
}
-static int rx_fail_evt_rep(struct msgb *mb, struct gsm_bts *bts)
+/* Parse into newly allocated struct abis_nm_fail_evt_rep, caller must free
it. */
+struct nm_fail_rep_signal_data *abis_nm_fail_evt_rep_parse(struct msgb *mb,
struct gsm_bts *bts)
{
struct abis_om_hdr *oh = msgb_l2(mb);
struct abis_om_fom_hdr *foh = msgb_l3(mb);
- struct e1inp_sign_link *sign_link = mb->dst;
- struct nm_fail_rep_signal_data sd;
- struct tlv_parsed tp;
- int rc = 0;
+ struct nm_fail_rep_signal_data *sd;
+ struct tlv_parsed *tp;
const uint8_t *p_val = NULL;
char *p_text = NULL;
const char *e_type = NULL, *severity = NULL;
- abis_nm_tlv_parse(, sign_link->trx->bts, foh->data,
- oh->length-sizeof(*foh));
+ sd = talloc_zero(tall_bsc_ctx, struct nm_fail_rep_signal_data);
+ OSMO_ASSERT(sd);
+ tp = talloc(sd, struct tlv_parsed);
+ OSMO_ASSERT(tp);
- if (TLVP_PRESENT(, NM_ATT_ADD_TEXT)) {
- const uint8_t *val = TLVP_VAL(, NM_ATT_ADD_TEXT);
- p_text = talloc_strndup(tall_bsc_ctx, (const char *) val,
- TLVP_LEN(, NM_ATT_ADD_TEXT));
+ abis_nm_tlv_parse(tp, bts, foh->data, oh->length-sizeof(*foh));
+
+ if (TLVP_PRESENT(tp, NM_ATT_ADD_TEXT)) {
+ const uint8_t *val = TLVP_VAL(tp, NM_ATT_ADD_TEXT);
+ p_text = talloc_strndup(sd, (const char *) val, TLVP_LEN(tp,
NM_ATT_ADD_TEXT));
}
- if (TLVP_PRESENT(, NM_ATT_EVENT_TYPE))
- e_type = abis_nm_event_type_name(*TLVP_VAL(,
- NM_ATT_EVENT_TYPE));
+ if (TLVP_PRESENT(tp, NM_ATT_EVENT_TYPE))
+ e_type = abis_nm_event_type_name(*TLVP_VAL(tp,
NM_ATT_EVENT_TYPE));
- if (TLVP_PRESENT(, NM_ATT_SEVERITY))
- severity = abis_nm_severity_name(*TLVP_VAL(,
- NM_ATT_SEVERITY));
+ if (TLVP_PRESENT(tp, NM_ATT_SEVERITY))
+ severity = abis_nm_severity_name(*TLVP_VAL(tp,
NM_ATT_SEVERITY));
- if (TLVP_PRESENT(, NM_ATT_PROB_CAUSE)) {
- p_val = TLVP_VAL(, NM_ATT_PROB_CAUSE);
+ if (TLVP_PRESENT(tp, NM_ATT_PROB_CAUSE))
+ p_val = TLVP_VAL(tp, NM_ATT_PROB_CAUSE);
+ sd->bts = bts;
+ sd->msg = mb;
+ sd->tp = tp;
+ if (e_type)
+ sd->parsed.event_type = e_type;
+ else
+ sd->parsed.event_type = "";
+ if (severity)
+ sd->parsed.severity = severity;
+ else
+ sd->parsed.severity = "";
+ if (p_text)
+ sd->parsed.additional_text = p_text;
+ else
+ sd->parsed.additional_text = "";
+ sd->parsed.probable_cause = p_val;
+
+ return sd;
+}
+
+static int rx_fail_evt_rep(struct msgb *mb, struct gsm_bts *bts)
+{
+ struct nm_fail_rep_signal_data *sd;
+ int rc = 0;
+ const uint8_t *p_val;
+ const char *e_type, *severity, *p_text;
+
+ sd = abis_nm_fail_evt_rep_parse(mb, bts);
+ e_type = sd->parsed.event_type;
+ severity = sd->parsed.severity;
+ p_text = sd->parsed.additional_text;
+ p_val = sd->parsed.probable_cause;
+
+ if (p_val) {
switch (p_val[0]) {
case NM_PCAUSE_T_MANUF:
Change in osmo-gsm-tester[master]: srs_enb: enable console trace, use RemoteProcess class and fix params
srs_andre has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17587 )
Change subject: srs_enb: enable console trace, use RemoteProcess class and fix
params
..
srs_enb: enable console trace, use RemoteProcess class and fix params
In order for the console trace to work over SSH this commit
switches to use the default RemoteProcess class. Note that srsENB
now correctly handles the SIGHUP signal.
The commit also remove a few unneeded params of the eNB.
Change-Id: If5af43effa9145b6764a32557a20a2e1760f0486
---
M src/osmo_gsm_tester/srs_enb.py
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester
refs/changes/87/17587/1
diff --git a/src/osmo_gsm_tester/srs_enb.py b/src/osmo_gsm_tester/srs_enb.py
index ae9b12f..b354408 100644
--- a/src/osmo_gsm_tester/srs_enb.py
+++ b/src/osmo_gsm_tester/srs_enb.py
@@ -116,6 +116,10 @@
else:
self.start_locally()
+# send t+Enter to enable console trace
+self.dbg('Enabling console trace')
+self.process.stdin_write('t\n')
+
def start_remotely(self):
self.inst =
util.Dir(os.path.abspath(self.suite_run.trial.get_inst('srslte')))
lib = self.inst.child('lib')
@@ -150,12 +154,10 @@
'--enb_files.sib_config=' + self.remote_config_sib_file,
'--enb_files.rr_config=' + self.remote_config_rr_file,
'--enb_files.drb_config=' + self.remote_config_drb_file,
-'--expert.nof_phy_threads=1',
-'--expert.rrc_inactivity_timer=1500',
'--log.filename=' + self.remote_log_file,
'--pcap.filename=' + self.remote_pcap_file)
-self.process =
self.rem_host.RemoteProcessFixIgnoreSIGHUP(srsENB.BINFILE,
util.Dir(srsENB.REMOTE_DIR), args, remote_env=remote_env)
+self.process = self.rem_host.RemoteProcess(srsENB.BINFILE, args,
remote_env=remote_env)
self.suite_run.remember_to_stop(self.process)
self.process.launch()
@@ -176,8 +178,6 @@
'--enb_files.sib_config=' +
os.path.abspath(self.config_sib_file),
'--enb_files.rr_config=' +
os.path.abspath(self.config_rr_file),
'--enb_files.drb_config=' +
os.path.abspath(self.config_drb_file),
-'--expert.nof_phy_threads=1',
-'--expert.rrc_inactivity_timer=1500',
'--log.filename=' + self.log_file,
'--pcap.filename=' + self.pcap_file)
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17587
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: If5af43effa9145b6764a32557a20a2e1760f0486
Gerrit-Change-Number: 17587
Gerrit-PatchSet: 1
Gerrit-Owner: srs_andre
Gerrit-MessageType: newchange
Change in osmo-gsm-tester[master]: srs_ue: adding num_carriers paramter and corresponding modifier
srs_andre has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17585 )
Change subject: srs_ue: adding num_carriers paramter and corresponding modifier
..
srs_ue: adding num_carriers paramter and corresponding modifier
this allows to configure a UE to support multiple carriers
Change-Id: I4fa0a0c6e52efb17aa0b07e55abb5470d8028e8b
---
A example/scenarios/mod-srsue-ncarriers@.conf
M src/osmo_gsm_tester/resource.py
M src/osmo_gsm_tester/templates/srsue.conf.tmpl
3 files changed, 15 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester
refs/changes/85/17585/1
diff --git a/example/scenarios/mod-srsue-ncarriers@.conf
b/example/scenarios/mod-srsue-ncarriers@.conf
new file mode 100644
index 000..bb6409a
--- /dev/null
+++ b/example/scenarios/mod-srsue-ncarriers@.conf
@@ -0,0 +1,3 @@
+modifiers:
+ modem:
+ - num_carriers: ${param1}
diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py
index 3b805ff..bb44f39 100644
--- a/src/osmo_gsm_tester/resource.py
+++ b/src/osmo_gsm_tester/resource.py
@@ -108,6 +108,7 @@
'modem[].features[]': schema.MODEM_FEATURE,
'modem[].rf_dev_type': schema.STR,
'modem[].rf_dev_args': schema.STR,
+'modem[].num_carriers': schema.STR,
'modem[].airplane_t_on_ms': schema.INT,
'modem[].airplane_t_off_ms': schema.INT,
'osmocon_phone[].serial_device': schema.STR,
diff --git a/src/osmo_gsm_tester/templates/srsue.conf.tmpl
b/src/osmo_gsm_tester/templates/srsue.conf.tmpl
index 12081c5..90925b3 100644
--- a/src/osmo_gsm_tester/templates/srsue.conf.tmpl
+++ b/src/osmo_gsm_tester/templates/srsue.conf.tmpl
@@ -31,13 +31,18 @@
# Default is auto (yes for UHD, no for rest)
#
[rf]
-dl_earfcn = 3400
+% if ue.num_carriers == 2:
+dl_earfcn = 2850,3050
+% else:
+dl_earfcn = 2850
+% endif
freq_offset = 0
tx_gain = 80
#rx_gain = 40
#nof_radios = 1
nof_antennas = ${ue.num_antennas}
+nof_carriers = ${ue.num_carriers}
device_name = ${ue.rf_dev_type}
@@ -138,8 +143,13 @@
# mbms_service_port: Port of the MBMS service
#
[rrc]
+% if ue.num_carriers == 2:
+ue_category = 7
+release = 10
+% else:
#ue_category = 4
#release = 8
+% endif
#feature_group = 0xe6041000
#mbms_service_id = -1
#mbms_service_port = 4321
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17585
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: I4fa0a0c6e52efb17aa0b07e55abb5470d8028e8b
Gerrit-Change-Number: 17585
Gerrit-PatchSet: 1
Gerrit-Owner: srs_andre
Gerrit-MessageType: newchange
Change in osmo-gsm-tester[master]: ms: add optional param to specify fixed APN IP address assigned to a MS
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17582 to look at the new patch set (#2). Change subject: ms: add optional param to specify fixed APN IP address assigned to a MS .. ms: add optional param to specify fixed APN IP address assigned to a MS this allows to specify a fixed APN address for each subscriber in the HLR. If the param is not provided in the resources config, the default allocation type is used, which is to dynamically allocate an IP in the supported range. Change-Id: Ie6fcd7987dc7bc62a686bee3a10c67e3dd813419 --- M src/osmo_gsm_tester/modem.py M src/osmo_gsm_tester/ms.py M src/osmo_gsm_tester/resource.py M src/osmo_gsm_tester/srs_epc.py M src/osmo_gsm_tester/templates/srsepc_user_db.csv.tmpl 5 files changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/82/17582/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17582 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: Ie6fcd7987dc7bc62a686bee3a10c67e3dd813419 Gerrit-Change-Number: 17582 Gerrit-PatchSet: 2 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in osmo-gsm-tester[master]: srs_enb: add num_cells param to srsENB
Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17583 to look at the new patch set (#2). Change subject: srs_enb: add num_cells param to srsENB .. srs_enb: add num_cells param to srsENB this is needed to support the upcoming multi-cell feature in srsENB. It's required for carrier aggregation (CA) but can also be used for (currently) two independent 4G cells. This commit adds baseline support for the parameter. Upcoming commits will add hooks to configure the cell's EARFCN, etc. Change-Id: I6d1658bf820163aee03b64b0f4ac68046c243f37 --- M example/defaults.conf A example/scenarios/mod-enb-ncells@.conf M src/osmo_gsm_tester/resource.py M src/osmo_gsm_tester/srs_enb.py M src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl 5 files changed, 47 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/83/17583/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17583 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: I6d1658bf820163aee03b64b0f4ac68046c243f37 Gerrit-Change-Number: 17583 Gerrit-PatchSet: 2 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-gsm-tester[master]: srs_{enb, ue}: add secondary cell and set dl/ul freq in eNB/UE config ...
srs_andre has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17586 )
Change subject: srs_{enb,ue}: add secondary cell and set dl/ul freq in eNB/UE
config accordingly
..
srs_{enb,ue}: add secondary cell and set dl/ul freq in eNB/UE config accordingly
Change-Id: I3730856003fffda4f3c3f9e835d62ddc312c4c31
---
M src/osmo_gsm_tester/srs_enb.py
M src/osmo_gsm_tester/srs_ue.py
M src/osmo_gsm_tester/templates/srsenb.conf.tmpl
M src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
4 files changed, 6 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester
refs/changes/86/17586/1
diff --git a/src/osmo_gsm_tester/srs_enb.py b/src/osmo_gsm_tester/srs_enb.py
index c4c72bc..ae9b12f 100644
--- a/src/osmo_gsm_tester/srs_enb.py
+++ b/src/osmo_gsm_tester/srs_enb.py
@@ -213,6 +213,7 @@
+ ',tx_port2=tcp://' + self.addr() + ':2002' \
+ ',rx_port=tcp://' + self.ue.addr() + ':2001' \
+ ',rx_port2=tcp://' + self.ue.addr() + ':2003' \
++
',tx_freq=2630e6,rx_freq=2510e6,tx_freq2=2650e6,rx_freq2=2530e6' \
+ ',id=enb,base_srate=' + str(base_srate)
config.overlay(values, dict(enb=dict(rf_dev_args=rf_dev_args)))
diff --git a/src/osmo_gsm_tester/srs_ue.py b/src/osmo_gsm_tester/srs_ue.py
index fdcd6dd..3764496 100644
--- a/src/osmo_gsm_tester/srs_ue.py
+++ b/src/osmo_gsm_tester/srs_ue.py
@@ -234,6 +234,7 @@
+
',tx_port2=tcp://' + self.addr() + ':2003' \
+
',rx_port=tcp://' + self.enb.addr() + ':2000' \
+
',rx_port2=tcp://' + self.enb.addr() + ':2002' \
++
',tx_freq=2510e6,rx_freq=2630e6,tx_freq2=2530e6,rx_freq2=2650e6' \
+
',id=ue,base_srate='+ str(base_srate)
)))
diff --git a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl
b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl
index d16f9d1..954b63f 100644
--- a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl
+++ b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl
@@ -63,7 +63,6 @@
# Default "auto". B210 USRP: 400 us, bladeRF: 0 us.
#
[rf]
-dl_earfcn = 3400
tx_gain = 80
rx_gain = 40
diff --git a/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
b/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
index 2d31c3d..cd9f4aa 100644
--- a/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
+++ b/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
@@ -58,8 +58,8 @@
tac = 0x0001;
pci = 1;
// root_seq_idx = 204;
-dl_earfcn = 3400;
-//ul_earfcn = 21400;
+dl_earfcn = 2850;
+//ul_earfcn = 20850;
ho_active = false;
// CA cells
@@ -94,8 +94,8 @@
tac = 0x0002;
pci = 2;
root_seq_idx = 205;
-dl_earfcn = 2910;
-ul_earfcn = 20910;
+dl_earfcn = 3050;
+//ul_earfcn = 21050;
ho_active = false;
// CA cells
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17586
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: I3730856003fffda4f3c3f9e835d62ddc312c4c31
Gerrit-Change-Number: 17586
Gerrit-PatchSet: 1
Gerrit-Owner: srs_andre
Gerrit-MessageType: newchange
Change in osmo-ggsn[master]: doc: switch log levels to notice
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/17584 ) Change subject: doc: switch log levels to notice .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ggsn/+/17584/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-ggsn/+/17584/1//COMMIT_MSG@9 PS1, Line 9: Some of the log levels are set to info, lets switch them to info to notice. Is this really useful? Is it too verbose now? -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/17584 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I91743c870d8084b1a106b41be92661c7674a8584 Gerrit-Change-Number: 17584 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 24 Mar 2020 11:08:31 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-ggsn[master]: doc: switch log levels to notice
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/17584 ) Change subject: doc: switch log levels to notice .. doc: switch log levels to notice Some of the log levels are set to info, lets switch them to info Change-Id: I91743c870d8084b1a106b41be92661c7674a8584 --- M doc/examples/osmo-ggsn.cfg 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/84/17584/1 diff --git a/doc/examples/osmo-ggsn.cfg b/doc/examples/osmo-ggsn.cfg index 22aeb45..d3693e1 100644 --- a/doc/examples/osmo-ggsn.cfg +++ b/doc/examples/osmo-ggsn.cfg @@ -7,9 +7,9 @@ logging color 1 logging print category 0 logging timestamp 0 - logging level ip info - logging level tun info - logging level ggsn info + logging level ip notice + logging level tun notice + logging level ggsn notice logging level sgsn notice logging level icmp6 notice logging level lglobal notice @@ -20,7 +20,7 @@ logging level lmib notice logging level lsms notice logging level lctrl notice - logging level lgtp info + logging level lgtp notice logging level lstats notice logging level lgsup notice logging level loap notice -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/17584 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I91743c870d8084b1a106b41be92661c7674a8584 Gerrit-Change-Number: 17584 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange
Change in osmo-gsm-tester[master]: srs_enb: add num_cells param to srsENB
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17583 ) Change subject: srs_enb: add num_cells param to srsENB .. Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17583/1/src/osmo_gsm_tester/srs_enb.py File src/osmo_gsm_tester/srs_enb.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17583/1/src/osmo_gsm_tester/srs_enb.py@84 PS1, Line 84: self._num_cells = 1 Rather define the default value 1 in defaults.conf. See how it's done for bsc_bts and bts nodes in defaults.conf, as well as example.conf.prod (check "num_trx", "max_trx" attributes and check in osmo-bts how dictionaries containing configuration for each TRX are mangled based on those). -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17583 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: I6d1658bf820163aee03b64b0f4ac68046c243f37 Gerrit-Change-Number: 17583 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 24 Mar 2020 09:58:33 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: ms: add optional param to specify fixed SPGW address assigned to MS
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17582 ) Change subject: ms: add optional param to specify fixed SPGW address assigned to MS .. Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17582/1/src/osmo_gsm_tester/modem.py File src/osmo_gsm_tester/modem.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17582/1/src/osmo_gsm_tester/modem.py@471 PS1, Line 471: def set_spgw_addr(self, spgw_addr): Do you plan to set it through test? are you already using it? otherwise I think we can drop this one for now. It probably makes more sense to change it through dictionaries, agree? https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17582/1/src/osmo_gsm_tester/resource.py File src/osmo_gsm_tester/resource.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17582/1/src/osmo_gsm_tester/resource.py@103 PS1, Line 103: 'modem[].spgw_addr': schema.IPV4, Can we have something more generic (3g vs 4g) which we can also later extend? For instance "apn_ipaddr". This way later one we may want to have a "apn" dictionary with properties inside. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17582 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: Ie6fcd7987dc7bc62a686bee3a10c67e3dd813419 Gerrit-Change-Number: 17582 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 24 Mar 2020 09:54:36 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: ms: add optional param to specify fixed SPGW address assigned to MS
srs_andre has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17582 )
Change subject: ms: add optional param to specify fixed SPGW address assigned
to MS
..
ms: add optional param to specify fixed SPGW address assigned to MS
this allows to specify a fixed SPGW address for each subscriber in the
HLR. If the param is not provided in the resources config, the default
allocation type is used, which is to dynamically allocate an IP in the
supported range.
Change-Id: Ie6fcd7987dc7bc62a686bee3a10c67e3dd813419
---
M src/osmo_gsm_tester/modem.py
M src/osmo_gsm_tester/ms.py
M src/osmo_gsm_tester/resource.py
M src/osmo_gsm_tester/srs_epc.py
M src/osmo_gsm_tester/templates/srsepc_user_db.csv.tmpl
5 files changed, 15 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester
refs/changes/82/17582/1
diff --git a/src/osmo_gsm_tester/modem.py b/src/osmo_gsm_tester/modem.py
index f8a9245..a7729a6 100644
--- a/src/osmo_gsm_tester/modem.py
+++ b/src/osmo_gsm_tester/modem.py
@@ -367,6 +367,7 @@
self.dbg('creating from syspath %s' % self.syspath)
self._ki = None
self._imsi = None
+self._spgw_addr = None
self.run_dir =
util.Dir(suite_run.get_test_run_dir().new_dir(self.name().strip('/')))
self.sms_received_list = []
self.dbus = ModemDbusInteraction(self.dbuspath)
@@ -467,6 +468,14 @@
return self._ki
return super().ki()
+def set_spgw_addr(self, spgw_addr):
+self._spgw_addr = spgw_addr
+
+def spgw_addr(self):
+if self._spgw_addr is not None:
+return self._spgw_addr
+return 'dynamic'
+
def features(self):
return self._conf.get('features', [])
diff --git a/src/osmo_gsm_tester/ms.py b/src/osmo_gsm_tester/ms.py
index 222a078..d192727 100644
--- a/src/osmo_gsm_tester/ms.py
+++ b/src/osmo_gsm_tester/ms.py
@@ -34,6 +34,9 @@
def ki(self):
return self._conf.get('ki')
+def spgw_addr(self):
+return self._conf.get('spgw_addr', None)
+
def auth_algo(self):
return self._conf.get('auth_algo', None)
diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py
index 757a9c5..32da088 100644
--- a/src/osmo_gsm_tester/resource.py
+++ b/src/osmo_gsm_tester/resource.py
@@ -100,6 +100,7 @@
'modem[].imsi': schema.IMSI,
'modem[].ki': schema.KI,
'modem[].auth_algo': schema.AUTH_ALGO,
+'modem[].spgw_addr': schema.IPV4,
'modem[].remote_user': schema.STR,
'modem[].addr': schema.IPV4,
'modem[].ciphers[]': schema.CIPHER,
diff --git a/src/osmo_gsm_tester/srs_epc.py b/src/osmo_gsm_tester/srs_epc.py
index 0d020bc..a346a86 100644
--- a/src/osmo_gsm_tester/srs_epc.py
+++ b/src/osmo_gsm_tester/srs_epc.py
@@ -199,7 +199,7 @@
raise log.Error("Auth algo %r selected but no KI specified" %
algo_str)
subscriber_id = len(self.subscriber_list) # list index
-self.subscriber_list.append({'id': subscriber_id, 'imsi':
modem.imsi(), 'msisdn': msisdn, 'auth_algo': algo_str, 'ki': modem.ki(), 'opc':
None})
+self.subscriber_list.append({'id': subscriber_id, 'imsi':
modem.imsi(), 'msisdn': msisdn, 'auth_algo': algo_str, 'ki': modem.ki(), 'opc':
None, 'spgw_addr': modem.spgw_addr()})
self.log('Add subscriber', msisdn=msisdn, imsi=modem.imsi(),
subscriber_id=subscriber_id,
algo_str=algo_str)
diff --git a/src/osmo_gsm_tester/templates/srsepc_user_db.csv.tmpl
b/src/osmo_gsm_tester/templates/srsepc_user_db.csv.tmpl
index c213e53..8dd6257 100644
--- a/src/osmo_gsm_tester/templates/srsepc_user_db.csv.tmpl
+++ b/src/osmo_gsm_tester/templates/srsepc_user_db.csv.tmpl
@@ -20,5 +20,5 @@
#ue2,mil,001010123456780,00112233445566778899aabbccddeeff,opc,63bfa50ee6523365ff14c1f45f88737d,8000,1234,7,dynamic
#ue1,xor,001010123456789,00112233445566778899aabbccddeeff,opc,63bfa50ee6523365ff14c1f45f88737d,9001,1255,7,dynamic
%for sub in epc.hss.subscribers:
-ogt${sub.id},${sub.auth_algo},${sub.imsi},${sub.ki},opc,63bfa50ee6523365ff14c1f45f88737d,8000,1234,${sub.qci},dynamic
+ogt${sub.id},${sub.auth_algo},${sub.imsi},${sub.ki},opc,63bfa50ee6523365ff14c1f45f88737d,8000,1234,${sub.qci},${sub.spgw_addr}
%endfor
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17582
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: Ie6fcd7987dc7bc62a686bee3a10c67e3dd813419
Gerrit-Change-Number: 17582
Gerrit-PatchSet: 1
Gerrit-Owner: srs_andre
Gerrit-MessageType: newchange
Change in osmo-gsm-tester[master]: srs_enb: add num_cells param to srsENB
srs_andre has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17583 )
Change subject: srs_enb: add num_cells param to srsENB
..
srs_enb: add num_cells param to srsENB
this is needed to support the upcoming multi-cell feature in srsENB.
It's required for carrier aggregation (CA) but can also
be used for (currently) two independent 4G cells.
This commit adds baseline support for the parameter. Upcoming
commits will add hooks to configure the cell's EARFCN, etc.
Change-Id: I6d1658bf820163aee03b64b0f4ac68046c243f37
---
M src/osmo_gsm_tester/resource.py
M src/osmo_gsm_tester/srs_enb.py
M src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
3 files changed, 44 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester
refs/changes/83/17583/1
diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py
index 32da088..2609d67 100644
--- a/src/osmo_gsm_tester/resource.py
+++ b/src/osmo_gsm_tester/resource.py
@@ -90,6 +90,7 @@
'enb[].addr': schema.IPV4,
'enb[].num_prb': schema.UINT,
'enb[].transmission_mode': schema.LTE_TRANSMISSION_MODE,
+'enb[].num_cells': schema.UINT,
'enb[].rf_dev_type': schema.STR,
'enb[].rf_dev_args': schema.STR,
'arfcn[].arfcn': schema.INT,
diff --git a/src/osmo_gsm_tester/srs_enb.py b/src/osmo_gsm_tester/srs_enb.py
index 940665e..83d9814 100644
--- a/src/osmo_gsm_tester/srs_enb.py
+++ b/src/osmo_gsm_tester/srs_enb.py
@@ -81,6 +81,7 @@
self.remote_pcap_file = None
self._num_prb = 0
self._txmode = 0
+self._num_cells = 1
self.enable_pcap = False
self.suite_run = suite_run
self.remote_user = conf.get('remote_user', None)
@@ -201,6 +202,8 @@
assert self._num_prb
self._txmode = int(values['enb'].get('transmission_mode', None))
assert self._txmode
+self._num_cells = int(values['enb'].get('num_cells', None))
+assert self._num_cells
config.overlay(values, dict(enb={ 'num_ports': self.num_ports() }))
# We need to set some specific variables programatically here to match
IP addresses:
@@ -248,6 +251,9 @@
def num_prb(self):
return self._num_prb
+def num_cells(self):
+return self._num_cells
+
def num_ports(self):
if self._txmode == 1:
return 1
diff --git a/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
b/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
index 3dd3fee..2d31c3d 100644
--- a/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
+++ b/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
@@ -86,5 +86,42 @@
rsrq_config = 4;
};
}
+% if enb.get('num_cells') == '2':
+ ,
+ {
+rf_port = 1;
+cell_id = 0x02;
+tac = 0x0002;
+pci = 2;
+root_seq_idx = 205;
+dl_earfcn = 2910;
+ul_earfcn = 20910;
+ho_active = false;
+
+// CA cells
+scell_list = (
+ {cell_id = 0x01; cross_carrier_scheduling = false; scheduling_cell_id =
0x01; ul_allowed = true}
+)
+
+// Cells available for handover
+meas_cell_list =
+(
+ {
+eci = 0x19C02;
+dl_earfcn = 2850;
+pci = 1;
+ }
+);
+
+// ReportCfg (only A3 supported)
+meas_report_desc = {
+ a3_report_type = "RSRP";
+ a3_offset = 6;
+ a3_hysteresis = 0;
+ a3_time_to_trigger = 480;
+ rsrq_config = 4;
+};
+ }
+% endif
// Add here more cells
);
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17583
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: I6d1658bf820163aee03b64b0f4ac68046c243f37
Gerrit-Change-Number: 17583
Gerrit-PatchSet: 1
Gerrit-Owner: srs_andre
Gerrit-MessageType: newchange
Change in osmo-gsm-tester[master]: srs_ue: add scenario for airplane mode simulation in srsUE
srs_andre has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17577 )
Change subject: srs_ue: add scenario for airplane mode simulation in srsUE
..
srs_ue: add scenario for airplane mode simulation in srsUE
Change-Id: I5db2ff325ce4b4236c1ceec0831dd7420d52dedb
---
M example/defaults.conf
A example/scenarios/mod-srsue-airplane_mode_sim@.conf
M src/osmo_gsm_tester/resource.py
M src/osmo_gsm_tester/templates/srsue.conf.tmpl
4 files changed, 23 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/example/defaults.conf b/example/defaults.conf
index 60539c8..dcb84db 100644
--- a/example/defaults.conf
+++ b/example/defaults.conf
@@ -108,3 +108,5 @@
srsue:
enable_pcap: false
+ airplane_t_on_ms: -1
+ airplane_t_off_ms: -1
diff --git a/example/scenarios/mod-srsue-airplane_mode_sim@.conf
b/example/scenarios/mod-srsue-airplane_mode_sim@.conf
new file mode 100644
index 000..c05fba1
--- /dev/null
+++ b/example/scenarios/mod-srsue-airplane_mode_sim@.conf
@@ -0,0 +1,4 @@
+modifiers:
+ modem:
+- airplane_t_on_ms: ${param1}
+ airplane_t_off_ms: ${param2}
diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py
index 8a93ea4..757a9c5 100644
--- a/src/osmo_gsm_tester/resource.py
+++ b/src/osmo_gsm_tester/resource.py
@@ -106,6 +106,8 @@
'modem[].features[]': schema.MODEM_FEATURE,
'modem[].rf_dev_type': schema.STR,
'modem[].rf_dev_args': schema.STR,
+'modem[].airplane_t_on_ms': schema.INT,
+'modem[].airplane_t_off_ms': schema.INT,
'osmocon_phone[].serial_device': schema.STR,
}
diff --git a/src/osmo_gsm_tester/templates/srsue.conf.tmpl
b/src/osmo_gsm_tester/templates/srsue.conf.tmpl
index ffcafcd..12081c5 100644
--- a/src/osmo_gsm_tester/templates/srsue.conf.tmpl
+++ b/src/osmo_gsm_tester/templates/srsue.conf.tmpl
@@ -336,6 +336,21 @@
#force_ul_amplitude = 0
#
+# Simulation configuration options
+#
+# The UE simulation supports turning on and off airplane mode in the UE.
+# The actions are carried periodically until the UE is stopped.
+#
+# airplane_t_on_ms: Time to leave airplane mode turned on (in ms)
+#
+# airplane_t_off_ms: Time to leave airplane mode turned off (in ms)
+#
+#
+[sim]
+airplane_t_on_ms = ${ue.airplane_t_on_ms}
+airplane_t_off_ms = ${ue.airplane_t_off_ms}
+
+#
# General configuration options
#
# metrics_csv_enable: Write UE metrics to CSV file.
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17577
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: I5db2ff325ce4b4236c1ceec0831dd7420d52dedb
Gerrit-Change-Number: 17577
Gerrit-PatchSet: 2
Gerrit-Owner: srs_andre
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-Reviewer: srs_andre
Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: srs{enb, ue}.conf.tmpl: make sure to only use a single PHY thread when...
srs_andre has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17563 )
Change subject: srs{enb,ue}.conf.tmpl: make sure to only use a single PHY
thread when running with ZMQ
..
srs{enb,ue}.conf.tmpl: make sure to only use a single PHY thread when running
with ZMQ
Change-Id: Icc1e67705c0354ece77c037f224a9c756a16daaa
---
M src/osmo_gsm_tester/templates/srsenb.conf.tmpl
M src/osmo_gsm_tester/templates/srsue.conf.tmpl
2 files changed, 10 insertions(+), 6 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl
b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl
index 51afcce..d16f9d1 100644
--- a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl
+++ b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl
@@ -135,11 +135,11 @@
#
# max_aggr_level:Optional maximum aggregation level index (l=log2(L) can
be 0, 1, 2 or 3)
# pdsch_mcs: Optional fixed PDSCH MCS (ignores reported CQIs if
specified)
-# pdsch_max_mcs: Optional PDSCH MCS limit
+# pdsch_max_mcs: Optional PDSCH MCS limit
# pusch_mcs: Optional fixed PUSCH MCS (ignores reported CQIs if
specified)
-# pusch_max_mcs: Optional PUSCH MCS limit
-# min_nof_ctrl_symbols: Minimum number of control symbols
-# max_nof_ctrl_symbols: Maximum number of control symbols
+# pusch_max_mcs: Optional PUSCH MCS limit
+# min_nof_ctrl_symbols: Minimum number of control symbols
+# max_nof_ctrl_symbols: Maximum number of control symbols
#
#
[scheduler]
@@ -265,7 +265,9 @@
[expert]
#pusch_max_its= 8 # These are half iterations
#pusch_8bit_decoder = false
-#nof_phy_threads = 3
+% if enb.get('rf_dev_type') == 'zmq':
+nof_phy_threads = 1
+% endif
#metrics_period_secs = 1
#metrics_csv_enable = false
#metrics_csv_filename = /tmp/enb_metrics.csv
diff --git a/src/osmo_gsm_tester/templates/srsue.conf.tmpl
b/src/osmo_gsm_tester/templates/srsue.conf.tmpl
index 4a4828e..ffcafcd 100644
--- a/src/osmo_gsm_tester/templates/srsue.conf.tmpl
+++ b/src/osmo_gsm_tester/templates/srsue.conf.tmpl
@@ -317,7 +317,9 @@
#snr_ema_coeff = 0.1
#snr_estim_alg = refs
#pdsch_max_its = 8# These are half iterations
-#nof_phy_threads = 3
+% if ue.get('rf_dev_type') == 'zmq':
+nof_phy_threads = 1
+% endif
#equalizer_mode = mmse
#sfo_ema = 0.1
#sfo_correct_period = 10
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17563
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: Icc1e67705c0354ece77c037f224a9c756a16daaa
Gerrit-Change-Number: 17563
Gerrit-PatchSet: 5
Gerrit-Owner: srs_andre
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-Reviewer: srs_andre
Gerrit-MessageType: merged
Change in osmo-bts[master]: VTY: add "test send-failure-event-report"
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/17573 )
Change subject: VTY: add "test send-failure-event-report"
..
VTY: add "test send-failure-event-report"
Send test failure event report OML message to the BSC. I found this
useful while manually testing related handling code in OsmoBSC.
Related: OS#1605
Change-Id: I0c4eba1636d8faf5012db26643bdf1d9fb6bfa1e
---
M src/common/vty.c
1 file changed, 20 insertions(+), 0 deletions(-)
Approvals:
fixeria: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/common/vty.c b/src/common/vty.c
index ab38dc1..2cf3224 100644
--- a/src/common/vty.c
+++ b/src/common/vty.c
@@ -928,6 +928,25 @@
return CMD_SUCCESS;
}
+DEFUN(test_send_failure_event_report, test_send_failure_event_report_cmd,
"test send-failure-event-report <0-255>",
+ "Various testing commands\n"
+ "Send a test OML failure event report to the BSC\n" BTS_NR_STR)
+{
+ struct gsm_network *net = gsmnet_from_vty(vty);
+ int bts_nr = atoi(argv[0]);
+ struct gsm_bts *bts;
+
+ if (bts_nr >= net->num_bts) {
+ vty_out(vty, "%% can't find BTS '%s'%s", argv[0], VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+
+ bts = gsm_bts_num(net, bts_nr);
+ oml_tx_failure_event_rep(>mo, NM_SEVER_MINOR,
OSMO_EVT_WARN_SW_WARN, "test message sent from VTY");
+
+ return CMD_SUCCESS;
+}
+
static void trx_dump_vty(struct vty *vty, struct gsm_bts_trx *trx)
{
vty_out(vty, "TRX %u of BTS %u is on ARFCN %u%s",
@@ -1716,6 +1735,7 @@
install_element(ENABLE_NODE, _t_t_l_jitter_buf_cmd);
install_element(ENABLE_NODE, _t_t_l_loopback_cmd);
install_element(ENABLE_NODE, _bts_t_t_l_loopback_cmd);
+ install_element(ENABLE_NODE, _send_failure_event_report_cmd);
install_element(CONFIG_NODE, _phy_cmd);
install_node(_node, config_write_phy);
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/17573
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I0c4eba1636d8faf5012db26643bdf1d9fb6bfa1e
Gerrit-Change-Number: 17573
Gerrit-PatchSet: 5
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-bts[master]: VTY: add "test send-failure-event-report"
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/17573 ) Change subject: VTY: add "test send-failure-event-report" .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/17573 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0c4eba1636d8faf5012db26643bdf1d9fb6bfa1e Gerrit-Change-Number: 17573 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 24 Mar 2020 07:52:52 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: VTY: add "test send-failure-event-report"
Hello fixeria, pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/17573 to look at the new patch set (#4). Change subject: VTY: add "test send-failure-event-report" .. VTY: add "test send-failure-event-report" Send test failure event report OML message to the BSC. I found this useful while manually testing related handling code in OsmoBSC. Related: OS#1605 Change-Id: I0c4eba1636d8faf5012db26643bdf1d9fb6bfa1e --- M src/common/vty.c 1 file changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/73/17573/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/17573 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0c4eba1636d8faf5012db26643bdf1d9fb6bfa1e Gerrit-Change-Number: 17573 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: VTY: add "test send-failure-event-report"
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/17573 ) Change subject: VTY: add "test send-failure-event-report" .. Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/17573/3/src/common/vty.c File src/common/vty.c: https://gerrit.osmocom.org/c/osmo-bts/+/17573/3/src/common/vty.c@931 PS3, Line 931: test > I would prefer to see 'test' as an individual node, so if someone would need > more special commands i […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/17573 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0c4eba1636d8faf5012db26643bdf1d9fb6bfa1e Gerrit-Change-Number: 17573 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 24 Mar 2020 07:33:00 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
Change in osmo-bsc[master]: abis_nm.c: rx_fail_evt_rep: fix sd.bts
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/17569 ) Change subject: abis_nm.c: rx_fail_evt_rep: fix sd.bts .. abis_nm.c: rx_fail_evt_rep: fix sd.bts Use the extra bts pointer instead of mb->trx->bts, which does not point to an allocated bts. Related: OS#1605 Change-Id: Ie61512f5690763fa380bdf0e7fb4763dbda019d2 --- M src/osmo-bsc/abis_nm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, approved diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index a874b53..2d181e8 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -399,7 +399,7 @@ rc = -EINVAL; } - sd.bts = mb->trx->bts; + sd.bts = bts; sd.msg = mb; sd.tp = if (e_type) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/17569 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie61512f5690763fa380bdf0e7fb4763dbda019d2 Gerrit-Change-Number: 17569 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-MessageType: merged
