October 2023 - gerrit-log - lists.osmocom.org

[S] Change in osmo-ci[master]: obs: build_binpkg: no network during build
by osmith 06 Oct '23

06 Oct '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34676?usp=email ) Change subject: obs: build_binpkg: no network during build ...................................................................... obs: build_binpkg: no network during build Simulate that we don't have network during package builds in gerrit verifications, like it is the case when the packages will be built by OBS. Depends: osmo-epdg I2bb0b5f608cd5d9a24c2a367425c524447bd002c Change-Id: I00282552e9988d66fdc269c6230f0e1432ace360 --- M scripts/obs/build_binpkg.py M scripts/obs/data/build_binpkg.Dockerfile M scripts/obs/data/build_deb.sh M scripts/obs/data/build_rpm.sh 4 files changed, 24 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/76/34676/1 diff --git a/scripts/obs/build_binpkg.py b/scripts/obs/build_binpkg.py index f3b4bcf..ae2fe53 100755 --- a/scripts/obs/build_binpkg.py +++ b/scripts/obs/build_binpkg.py @@ -76,6 +76,9 @@ env["RUN_SHELL_ON_ERROR"] = "1" docker_args += ["-i", "-t"] + # Add capability needed for building without network + docker_args += ["--cap-add=NET_ADMIN"] + script_path = "data/build.sh" if not distro.startswith("debian:") and not distro.startswith("ubuntu:"): diff --git a/scripts/obs/data/build_binpkg.Dockerfile b/scripts/obs/data/build_binpkg.Dockerfile index 4d4b185..55bfe0c 100644 --- a/scripts/obs/data/build_binpkg.Dockerfile +++ b/scripts/obs/data/build_binpkg.Dockerfile @@ -28,6 +28,7 @@ fakeroot \ git \ gnupg2 \ + iproute2 \ && \ apt-get clean \ ;; \ @@ -40,6 +41,7 @@ gcc \ gcc-c++ \ glibc-devel \ + iproute \ libtool \ make \ redhat-rpm-config \ diff --git a/scripts/obs/data/build_deb.sh b/scripts/obs/data/build_deb.sh index 11eb36f..91fe2af 100755 --- a/scripts/obs/data/build_deb.sh +++ b/scripts/obs/data/build_deb.sh @@ -11,6 +11,9 @@ $apt_get update $apt_get build-dep . + +ip link set eth0 down + su "$BUILDUSER" -c "dpkg-buildpackage -us -uc -j$JOBS" # Show contents diff --git a/scripts/obs/data/build_rpm.sh b/scripts/obs/data/build_rpm.sh index 63c3638..4fe82bd 100755 --- a/scripts/obs/data/build_rpm.sh +++ b/scripts/obs/data/build_rpm.sh @@ -26,6 +26,8 @@ $yum_builddep "/home/$BUILDUSER/rpmbuild/SPECS/$spec" +ip link set eth0 down + su "$BUILDUSER" -c "rpmbuild -bb ~/rpmbuild/SPECS/$spec" # Make built rpms available outside of docker -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34676?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I00282552e9988d66fdc269c6230f0e1432ace360 Gerrit-Change-Number: 34676 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in ...osmo-epdg[master]: debian/rules: extract build_dep.tar.gz first
by osmith 06 Oct '23

06 Oct '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34675?usp=email ) Change subject: debian/rules: extract build_dep.tar.gz first ...................................................................... debian/rules: extract build_dep.tar.gz first dh_auto_build runs the default target of the Makefile in the top directory. Extract the build deps before running it, to avoid downloading the build dependencies again (which fails in OBS as we build without network there). Remove the redundant "rebar3 compile" and "rebare3 escriptize" commands, which are part of the default target in the Makefile. debian/rules was copied from osmo_dia2gsup, but there it works as-is because osmo_dia2gsup has no Makefile (-> dh_auto_build is a no-op). Change-Id: I2bb0b5f608cd5d9a24c2a367425c524447bd002c --- M debian/rules 1 file changed, 20 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/75/34675/1 diff --git a/debian/rules b/debian/rules index 89863f8..72a2bb6 100755 --- a/debian/rules +++ b/debian/rules @@ -8,10 +8,8 @@ dh $@ override_dh_auto_build: - dh_auto_build if [ -e build_dep.tar.gz ] ; then tar xzf ./build_dep.tar.gz ; fi - rebar3 compile - rebar3 escriptize + dh_auto_build rebar3 eunit override_dh_clean: -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34675?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I2bb0b5f608cd5d9a24c2a367425c524447bd002c Gerrit-Change-Number: 34675 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in ...osmo-epdg[master]: debian/source/format: new file
by osmith 06 Oct '23

06 Oct '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34674?usp=email ) Change subject: debian/source/format: new file ...................................................................... debian/source/format: new file Fix for: dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) dpkg-source: info: using source format '1.0' Change-Id: I8a1e5c76a5d302643311882c09ef49f4d3c5f5cd --- A debian/source/format 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/74/34674/1 diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34674?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I8a1e5c76a5d302643311882c09ef49f4d3c5f5cd Gerrit-Change-Number: 34674 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ci[master]: jobs/master-builds: add erlang projects
by osmith 06 Oct '23

06 Oct '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34661?usp=email ) Change subject: jobs/master-builds: add erlang projects ...................................................................... jobs/master-builds: add erlang projects Add the erlang projects found in gerrit-verifications to master-builds too, as we have it with most other Osmocom projects. Change-Id: I6cf5a3c1e52ee73ad63eb2d7d5b1af19a9809026 --- M jobs/master-builds.yml 1 file changed, 25 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index dcf40ef..8b8d551 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -66,6 +66,7 @@ -e PATH="/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" \ -v "$CCACHE_DIR:/ccache" \ docker_img: '$USER/debian-bookworm-build' + docker_img_erlang: '$USER/debian-bookworm-erlang' timeout_cmd: '/usr/bin/timeout 30m' cmd: '{docker_run_ccache} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh' trigger: @@ -270,6 +271,14 @@ -e WITH_MANUALS="$WITH_MANUALS" \ "$DOCKER_IMG" {timeout_cmd} /build/contrib/jenkins_bts_model.sh "$BTS_MODEL" + - osmo_dia2gsup: + repos_url: '{gerrit_url}/erlang/{repos}' + cmd: '{docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh' + + - osmo-epdg: + repos_url: '{gerrit_url}/erlang/{repos}' + cmd: '{docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh' + - osmo-e1-hardware: a2_name: JOB_TYPE a2: !!python/tuple ["firmware", "gateware", "manuals", "software"] @@ -330,6 +339,10 @@ - osmo-gsm-manuals + - osmo_gsup: + repos_url: '{gerrit_url}/erlang/{repos}' + cmd: '{docker_run_ccache} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh' + - osmo-gsm-tester: cmd: '{docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins-build-manuals.sh' -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34661?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6cf5a3c1e52ee73ad63eb2d7d5b1af19a9809026 Gerrit-Change-Number: 34661 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-ci[master]: jobs/master: use same url scheme as gerrit jobs
by osmith 06 Oct '23

06 Oct '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34660?usp=email ) Change subject: jobs/master: use same url scheme as gerrit jobs ...................................................................... jobs/master: use same url scheme as gerrit jobs Make it easier to copy entries from gerrit-verifications.yml to master-builds.yml by using the same url schema in both. Change-Id: Ibe992dd8027a8b8df8623abc57a590972443449f --- M jobs/master-builds.yml 1 file changed, 30 insertions(+), 15 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 52ed298..dcf40ef 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -70,7 +70,9 @@ cmd: '{docker_run_ccache} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh' trigger: email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org - git_base_url: https://gerrit.osmocom.org + gerrit_url: 'https://gerrit.osmocom.org' + gitea_url: 'https://gitea.osmocom.org' + repos_url: '{gerrit_url}/{repos}' branches: - master ssh: @@ -103,7 +105,7 @@ master-libosmo-netif, master-osmo-bts - libosmo-dsp: - git_base_url: https://gitea.osmocom.org/sdr + repos_url: '{gitea_url}/sdr/{repos}' cmd: | {docker_run_ccache} \ {docker_img} {timeout_cmd} sh -ex -c \ @@ -287,14 +289,14 @@ - binaries_ftp.osmocom.org - docs_ftp.osmocom.org - ice40-usbtrace: - git_base_url: https://gitea.osmocom.org/electronics + repos_url: '{gitea_url}/electronics/{repos}' docker_img: 'registry.osmocom.org/$USER/fpga-build' cmd: 'docker pull {docker_img} && {docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh --publish' ssh: - binaries_ftp.osmocom.org - docs_ftp.osmocom.org - no2bootloader: - git_base_url: https://github.com/no2fpga + repos_url: 'https://github.com/no2fpga/{repos}' docker_img: 'registry.osmocom.org/$USER/fpga-build' cmd: 'docker pull {docker_img} && {docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh --publish' email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de 246tnt(a)gmail.com @@ -303,7 +305,8 @@ - docs_ftp.osmocom.org - osmo-fl2k: - git_base_url: https://gitea.osmocom.org/sdr + repos_url: '{gitea_url}/sdr/{repos}' + - osmo-ggsn: a1_name: GTP a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux] @@ -322,7 +325,7 @@ - osmo-upf - osmo-gmr: - git_base_url: https://gitea.osmocom.org/satellite + repos_url: '{gitea_url}/satellite/{repos}' email: jenkins-notifications(a)lists.osmocom.org 246tnt(a)gmail.com - osmo-gsm-manuals @@ -344,7 +347,7 @@ master-osmo-hnbgw - osmo-ir77: - git_base_url: https://gitea.osmocom.org/satellite + repos_url: '{gitea_url}/satellite/{repos}' email: jenkins-notifications(a)lists.osmocom.org 246tnt(a)gmail.com - osmo-mgw: @@ -396,7 +399,7 @@ "$DOCKER_IMG" {timeout_cmd} /build/contrib/jenkins.sh - osmo-python-tests: - git_base_url: https://gerrit.osmocom.org/python + repos_url: '{gerrit_url}/python/{repos}' - osmo-sgsn: a1_name: IU @@ -455,7 +458,7 @@ - binaries_ftp.osmocom.org - docs_ftp.osmocom.org - simtrace: - git_base_url: https://gitea.osmocom.org/sim-card + repos_url: '{gitea_url}/sim-card/{repos}' email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de - simtrace2: cmd: '{docker_run_ccache} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh --publish' @@ -464,7 +467,7 @@ - binaries_ftp.osmocom.org - docs_ftp.osmocom.org - osmo-opencm3-projects: - git_base_url: https://gitea.osmocom.org/electronics + repos_url: '{gitea_url}/electronics/{repos}' cmd: '{docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh --publish' email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de ssh: @@ -496,7 +499,7 @@ {docker_img} {timeout_cmd} /build/contrib/jenkins.sh - rtl-sdr: - git_base_url: https://gitea.osmocom.org/sdr + repos_url: '{gitea_url}/sdr/{repos}' email: laforge(a)gnumonks.org steve(a)steve-m.de - pysim: @@ -525,12 +528,12 @@ concurrent: false cmd: cd ./tests; {timeout_cmd} ./run-tests slave_axis: !!python/tuple [simtester] - git_base_url: https://gitea.sysmocom.de/sysmocom + repos_url: 'https://gitea.sysmocom.de/sysmocom/{repos}' - dahdi-tools - xgoldmon: - git_base_url: https://github.com/2b-as + repos_url: 'https://github.com/2b-as/{repos}' cmd: | rm -rf osmo-ci git clone --depth=1 https://gerrit.osmocom.org/osmo-ci -b master @@ -551,7 +554,7 @@ num-to-keep: 120 description: | Automatic jenkins test job of - <a href="{git_base_url}/{repos}">{repos}</a> + <a href="{repos_url}">{repos}</a> <br/><br/> <b>Auto-generated using Jenkins Job Builder. DO NOT EDIT MANUALLY!</b> @@ -583,7 +586,7 @@ scm: - git: - url: "{git_base_url}/{repos}" + url: '{obj:repos_url}' branches: '{obj:branches}' refspec: name: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34660?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibe992dd8027a8b8df8623abc57a590972443449f Gerrit-Change-Number: 34660 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in libosmo-netif[master]: stream: Add and use IPA send function
by laforge 06 Oct '23

06 Oct '23

Attention is currently required from: arehbein, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33201?usp=email ) Change subject: stream: Add and use IPA send function ...................................................................... Patch Set 20: -Code-Review -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33201?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I61e1fe59166c46595efe8c1f32b8f2607cb6c529 Gerrit-Change-Number: 33201 Gerrit-PatchSet: 20 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 06 Oct 2023 05:35:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: fix TC_rsl_rf_resource_ind: handle dynTS and PDCH
by laforge 06 Oct '23

06 Oct '23

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34673?usp=email ) Change subject: BTS_Tests: fix TC_rsl_rf_resource_ind: handle dynTS and PDCH ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34673?usp=email 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: I2d13fd3f0fd15d1762bf6f2f61de85cbe990ec36 Gerrit-Change-Number: 34673 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 06 Oct 2023 05:34:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-ttcn3-hacks[master]: BTS_Tests: separate generating g_AllChannels[] into a function
by laforge 06 Oct '23

06 Oct '23

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34672?usp=email ) Change subject: BTS_Tests: separate generating g_AllChannels[] into a function ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34672?usp=email 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: Iab2d009b977255b16028c77a9b96df48d270ed1c Gerrit-Change-Number: 34672 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 06 Oct 2023 05:33:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: fix TC_rsl_rf_resource_ind: handle dynTS and PDCH
by fixeria 05 Oct '23

05 Oct '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34673?usp=email ) Change subject: BTS_Tests: fix TC_rsl_rf_resource_ind: handle dynTS and PDCH ...................................................................... BTS_Tests: fix TC_rsl_rf_resource_ind: handle dynTS and PDCH Change-Id: I2d13fd3f0fd15d1762bf6f2f61de85cbe990ec36 Related: osmo-bts.git I56f83db5264c246ec1b4b8a973105a4fc09931fb Related: SYS#5313, OS#5956 --- M bts/BTS_Tests.ttcn 1 file changed, 35 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/73/34673/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 6e4a36a..db66b0c 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -7758,22 +7758,38 @@ } } testcase TC_rsl_rf_resource_ind() runs on test_CT { + var TrxParsItem trx_pars := mp_trx_pars[0]; var RSL_ResourceInfo info := { }; + var ChannelNrs chans := { }; f_init(trx_nr := 0); f_init_l1ctl(); f_l1_tune(L1CTL); - /* g_AllChannels contains all logical channels */ - for (var integer i := 0; i < lengthof(g_AllChannels); i := i + 1) { - var RslChannelNr chan_nr := g_AllChannels[i]; + /* Generate a list of logical channels from module parameters */ + for (var integer tn := 0; tn < lengthof(trx_pars.ts); tn := tn + 1) { + var PchanConfig config := trx_pars.ts[tn].config; + select (config) { + case (GSM_PCHAN_TCHH_TCHF_PDCH) { + /* dyn/osmocom: set to NONE by default */ + } + case (GSM_PCHAN_TCHF_PDCH) { + /* dyn/ipaccess: set to TCH/F by default */ + chans := chans & { valueof(ts_RslChanNr_Bm(tn)) }; + } + case (GSM_PCHAN_PDCH) { + chans := chans & { valueof(ts_RslChanNr_PDCH(tn)) }; + } + case else { + chans := chans & f_gen_chans_for_ts(tn, config); + } + } + } - /* FIXME: osmo-bts does not report for Osmocom style dynamic timeslots */ - if (mp_trx_pars[0].ts[chan_nr.tn].config == GSM_PCHAN_TCHH_TCHF_PDCH) - { continue; } - - info := info & { valueof(ts_RSL_ResourceInfoItem(chan_nr, mp_interf_band)) }; + /* Generate a list of RSL ResourceInfo items */ + for (var integer i := 0; i < lengthof(chans); i := i + 1) { + info := info & { valueof(ts_RSL_ResourceInfoItem(chans[i], mp_interf_band)) }; } /* Align to the first interference report */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34673?usp=email 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: I2d13fd3f0fd15d1762bf6f2f61de85cbe990ec36 Gerrit-Change-Number: 34673 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-ttcn3-hacks[master]: BTS_Tests: separate generating g_AllChannels[] into a function
by fixeria 05 Oct '23

05 Oct '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34672?usp=email ) Change subject: BTS_Tests: separate generating g_AllChannels[] into a function ...................................................................... BTS_Tests: separate generating g_AllChannels[] into a function Change-Id: Iab2d009b977255b16028c77a9b96df48d270ed1c Related: SYS#5313, OS#5956 --- M bts/BTS_Tests.ttcn 1 file changed, 50 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/72/34672/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index df18403..6e4a36a 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -515,6 +515,44 @@ trxc_conn_id := res.connId; } +private function f_gen_chans_for_ts(uint3_t tn, PchanConfig config) +return ChannelNrs +{ + select (config) { + case (GSM_PCHAN_CCCH_SDCCH4) { + return { valueof(ts_RslChanNr_SDCCH4(tn, 0)), + valueof(ts_RslChanNr_SDCCH4(tn, 1)), + valueof(ts_RslChanNr_SDCCH4(tn, 2)), + valueof(ts_RslChanNr_SDCCH4(tn, 3)) }; + } + case (GSM_PCHAN_SDCCH8) { + return { valueof(ts_RslChanNr_SDCCH8(tn, 0)), + valueof(ts_RslChanNr_SDCCH8(tn, 1)), + valueof(ts_RslChanNr_SDCCH8(tn, 2)), + valueof(ts_RslChanNr_SDCCH8(tn, 3)), + valueof(ts_RslChanNr_SDCCH8(tn, 4)), + valueof(ts_RslChanNr_SDCCH8(tn, 5)), + valueof(ts_RslChanNr_SDCCH8(tn, 6)), + valueof(ts_RslChanNr_SDCCH8(tn, 7)) }; + } + case (GSM_PCHAN_TCHH_TCHF_PDCH) { + return { valueof(ts_RslChanNr_Lm(tn, 0)), + valueof(ts_RslChanNr_Lm(tn, 1)), + valueof(ts_RslChanNr_Bm(tn)) }; + } + case (GSM_PCHAN_TCHH) { + return { valueof(ts_RslChanNr_Lm(tn, 0)), + valueof(ts_RslChanNr_Lm(tn, 1)) }; + } + case (GSM_PCHAN_TCHF, + GSM_PCHAN_TCHF_PDCH) { + return { valueof(ts_RslChanNr_Bm(tn)) }; + } + } + + return { }; +} + /* global init function (without PCUIF connection) */ friend function f_init(uint8_t trx_nr := 0) runs on test_CT @@ -550,41 +588,8 @@ /* Generate list of all logical channels from module parameters */ for (var integer tn := 0; tn < lengthof(trx_pars.ts); tn := tn + 1) { - select (trx_pars.ts[tn].config) { - case (GSM_PCHAN_CCCH_SDCCH4) { - g_AllChannels := g_AllChannels & - { valueof(ts_RslChanNr_SDCCH4(tn, 0)), - valueof(ts_RslChanNr_SDCCH4(tn, 1)), - valueof(ts_RslChanNr_SDCCH4(tn, 2)), - valueof(ts_RslChanNr_SDCCH4(tn, 3)) }; - } - case (GSM_PCHAN_SDCCH8) { - g_AllChannels := g_AllChannels & - { valueof(ts_RslChanNr_SDCCH8(tn, 0)), - valueof(ts_RslChanNr_SDCCH8(tn, 1)), - valueof(ts_RslChanNr_SDCCH8(tn, 2)), - valueof(ts_RslChanNr_SDCCH8(tn, 3)), - valueof(ts_RslChanNr_SDCCH8(tn, 4)), - valueof(ts_RslChanNr_SDCCH8(tn, 5)), - valueof(ts_RslChanNr_SDCCH8(tn, 6)), - valueof(ts_RslChanNr_SDCCH8(tn, 7)) }; - } - case (GSM_PCHAN_TCHH_TCHF_PDCH) { - g_AllChannels := g_AllChannels & - { valueof(ts_RslChanNr_Lm(tn, 0)), - valueof(ts_RslChanNr_Lm(tn, 1)), - valueof(ts_RslChanNr_Bm(tn)) }; - } - case (GSM_PCHAN_TCHH) { - g_AllChannels := g_AllChannels & - { valueof(ts_RslChanNr_Lm(tn, 0)), - valueof(ts_RslChanNr_Lm(tn, 1)) }; - } - case (GSM_PCHAN_TCHF, GSM_PCHAN_TCHF_PDCH) { - g_AllChannels := g_AllChannels & - { valueof(ts_RslChanNr_Bm(tn)) }; - } - } + var PchanConfig config := trx_pars.ts[tn].config; + g_AllChannels := g_AllChannels & f_gen_chans_for_ts(tn, config); } f_init_rsl(id); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34672?usp=email 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: Iab2d009b977255b16028c77a9b96df48d270ed1c Gerrit-Change-Number: 34672 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0