Build failure of network:osmocom:nightly/open5gs in xUbuntu_18.10/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/xUbuntu_18.10/i586 Package network:osmocom:nightly/open5gs failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: ameter/libfdproto/libfdproto.so.1.3.2 lib/gtp/libogsgtp.so.1.2.5 /usr/lib/i386-linux-gnu/libyaml.so -lidn -ldl -lsctp -lgcrypt -lgnutls -lidn -ldl -lsctp -lgcrypt -lgnutls -Wl,--end-group -pthread '-Wl,-rpath,$ORIGIN/../../lib/ipfw:$ORIGIN/../../lib/app:$ORIGIN/../../lib/core:$ORIGIN/../../lib/diameter/gx:$ORIGIN/../../lib/diameter/common:$ORIGIN/../../subprojects/freeDiameter/libfdcore:$ORIGIN/../../subprojects/freeDiameter/libfdproto:$ORIGIN/../../lib/gtp' -Wl,-rpath-link,/usr/src/packages/BUILD/obj-i686-linux-gnu/lib/ipfw:/usr/src/packages/BUILD/obj-i686-linux-gnu/lib/app:/usr/src/packages/BUILD/obj-i686-linux-gnu/lib/core:/usr/src/packages/BUILD/obj-i686-linux-gnu/lib/diameter/gx:/usr/src/packages/BUILD/obj-i686-linux-gnu/lib/diameter/common:/usr/src/packages/BUILD/obj-i686-linux-gnu/subprojects/freeDiameter/libfdcore:/usr/src/packages/BUILD/obj-i686-linux-gnu/subprojects/freeDiameter/libfdproto:/usr/src/packages/BUILD/obj-i686-linux-gnu/lib/gtp [ 245s] [1922/2112] cc -Isrc/udm/src@udm@@udm@sta -Isrc/udm -I../src/udm -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/sbi -I../lib/sbi -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/i386-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/udm/src@udm@@udm@sta/nnrf-handler.c.o' -MF 'src/udm/src@udm@@udm@sta/nnrf-handler.c.o.d' -o 'src/udm/src@udm@@udm@sta/nnrf-handler.c.o' -c ../src/udm/nnrf-handler.c [ 245s] [1923/2112] cc -Isrc/udr/src@udr@@udr@sta -Isrc/udr -I../src/udr -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/dbi -I../lib/dbi -Ilib/crypt -I../lib/crypt -Ilib/sbi -I../lib/sbi -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/libmongoc-1.0 -I/usr/include/libbson-1.0 -I/usr/include/p11-kit-1 -I/usr/include/i386-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/udr/src@udr@@udr@sta/context.c.o' -MF 'src/udr/src@udr@@udr@sta/context.c.o.d' -o 'src/udr/src@udr@@udr@sta/context.c.o' -c ../src/udr/context.c [ 245s] [1924/2112] cc -Isrc/udm/src@udm@@udm@sta -Isrc/udm -I../src/udm -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/sbi -I../lib/sbi -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/i386-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3
Build failure of network:osmocom:nightly/open5gs in xUbuntu_18.04/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/xUbuntu_18.04/i586 Package network:osmocom:nightly/open5gs failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 174s] [1935/2112] rm -f src/pcrf/libpcrf.a && gcc-ar csrD src/pcrf/libpcrf.a 'src/pcrf/pcrf@sta/pcrf-init.c.o' 'src/pcrf/pcrf@sta/pcrf-context.c.o' 'src/pcrf/pcrf@sta/pcrf-fd-path.c.o' 'src/pcrf/pcrf@sta/pcrf-gx-path.c.o' 'src/pcrf/pcrf@sta/pcrf-rx-path.c.o' [ 175s] [1936/2112] cc -Isrc/udm/udm@sta -Isrc/udm -I../src/udm -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/sbi -I../lib/sbi -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/i386-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/udm/udm@sta/context.c.o' -MF 'src/udm/udm@sta/context.c.o.d' -o 'src/udm/udm@sta/context.c.o' -c ../src/udm/context.c [ 175s] FAILED: src/udm/udm@sta/context.c.o [ 175s] cc -Isrc/udm/udm@sta -Isrc/udm -I../src/udm -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/sbi -I../lib/sbi -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/i386-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/udm/udm@sta/context.c.o' -MF 'src/udm/udm@sta/context.c.o.d' -o 'src/udm/udm@sta/context.c.o' -c ../src/udm/context.c [ 175s] ../src/udm/context.c: In function ‘udm_ue_add’: [ 175s] ../src/udm/context.c:129:38: error: format ‘%ld’ expects argument of type ‘long int’, but argument 2 has type ‘int’ [-Werror=format=] [ 175s] udm_ue->ctx_id = ogs_msprintf("%ld", ogs_pool_index(_ue_pool, udm_ue)); [ 175s] ~~^ [ 175s] %d [ 175s] cc1: some warnings being treated as errors [ 175s] [1937/2112] cc -Isrc/udm/udm@sta -Isrc/udm -I../src/udm -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/sbi -I../lib/sbi -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/i386-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=.
Build failure of network:osmocom:nightly/open5gs in Debian_10/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_10/i586 Package network:osmocom:nightly/open5gs failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: rror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/udr/e340f29@@udr@sta/nf-sm.c.o' -MF 'src/udr/e340f29@@udr@sta/nf-sm.c.o.d' -o 'src/udr/e340f29@@udr@sta/nf-sm.c.o' -c ../src/udr/nf-sm.c [ 258s] [1927/2112] cc -Isrc/udr/e340f29@@open5gs-udrd@exe -Isrc/udr -I../src/udr -Isrc -I../src -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/dbi -I../lib/dbi -Ilib/crypt -I../lib/crypt -Ilib/sbi -I../lib/sbi -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/libmongoc-1.0 -I/usr/include/libbson-1.0 -I/usr/include/p11-kit-1 -I/usr/include/i386-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -pthread '-DDEFAULT_CONFIG_FILENAME="/etc/open5gs/udr.yaml"' -MD -MQ 'src/udr/e340f29@@open5gs-udrd@exe/app.c.o' -MF 'src/udr/e340f29@@open5gs-udrd@exe/app.c.o.d' -o 'src/udr/e340f29@@open5gs-udrd@exe/app.c.o' -c ../src/udr/app.c [ 258s] [1928/2112] cc -Isrc/udr/e340f29@@udr@sta -Isrc/udr -I../src/udr -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/dbi -I../lib/dbi -Ilib/crypt -I../lib/crypt -Ilib/sbi -I../lib/sbi -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/libmongoc-1.0 -I/usr/include/libbson-1.0 -I/usr/include/p11-kit-1 -I/usr/include/i386-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/udr/e340f29@@udr@sta/sbi-path.c.o' -MF 'src/udr/e340f29@@udr@sta/sbi-path.c.o.d' -o 'src/udr/e340f29@@udr@sta/sbi-path.c.o' -c ../src/udr/sbi-path.c [ 258s] [1929/2112] cc -Isrc/udm/3eca12a@@udm@sta -Isrc/udm -I../src/udm -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/sbi -I../lib/sbi -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/i386-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration
Build failure of network:osmocom:nightly/libusrp in Debian_Unstable/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/Debian_Unstable/x86_64 Package network:osmocom:nightly/libusrp failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 156s] touch libfx2.lib [ 156s] for obj in delay.rel fx2utils.rel i2c.rel isr.rel timer.rel usb_common.rel; do basename $obj .rel >> libfx2.lib ; done [ 156s] make[4]: Leaving directory '/usr/src/packages/BUILD/firmware/lib' [ 156s] Making all in src [ 156s] make[4]: Entering directory '/usr/src/packages/BUILD/firmware/src' [ 156s] Making all in common [ 156s] make[5]: Entering directory '/usr/src/packages/BUILD/firmware/src/common' [ 156s] srcdir=. ./edit-gpif ./gpif.c usrp_gpif.c usrp_gpif_inline.h [ 156s] /usr/bin/env: 'python': No such file or directory [ 156s] make[5]: *** [Makefile:523: usrp_gpif.c] Error 127 [ 156s] make[5]: Leaving directory '/usr/src/packages/BUILD/firmware/src/common' [ 156s] make[4]: *** [Makefile:405: all-recursive] Error 1 [ 156s] make[4]: Leaving directory '/usr/src/packages/BUILD/firmware/src' [ 156s] make[3]: *** [Makefile:405: all-recursive] Error 1 [ 156s] make[3]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 156s] make[2]: *** [Makefile:635: all-recursive] Error 1 [ 156s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 156s] make[1]: *** [Makefile:554: all] Error 2 [ 156s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 156s] dh_auto_build: error: make -j1 returned exit code 2 [ 156s] make: *** [debian/rules:13: build] Error 25 [ 156s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 156s] ### VM INTERACTION START ### [ 159s] [ 149.187880] sysrq: SysRq : Power Off [ 159s] [ 149.192357] reboot: Power down [ 160s] ### VM INTERACTION END ### [ 160s] [ 160s] sheep86 failed "build libusrp_3.4.4.7.50ce.dsc" at Sat Jun 6 01:52:32 UTC 2020. [ 160s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/open5gs in Raspbian_10/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Raspbian_10/armv7l Package network:osmocom:nightly/open5gs failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 461s] [1933/2112] rm -f src/udr/libudr.a && gcc-ar csrD src/udr/libudr.a 'src/udr/e340f29@@udr@sta/context.c.o' 'src/udr/e340f29@@udr@sta/event.c.o' 'src/udr/e340f29@@udr@sta/timer.c.o' 'src/udr/e340f29@@udr@sta/nnrf-handler.c.o' 'src/udr/e340f29@@udr@sta/nf-sm.c.o' 'src/udr/e340f29@@udr@sta/nudr-handler.c.o' 'src/udr/e340f29@@udr@sta/sbi-path.c.o' 'src/udr/e340f29@@udr@sta/udr-sm.c.o' 'src/udr/e340f29@@udr@sta/init.c.o' [ 461s] [1934/2112] cc -Isrc/udm/3eca12a@@udm@sta -Isrc/udm -I../src/udm -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/sbi -I../lib/sbi -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/arm-linux-gnueabihf -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/udm/3eca12a@@udm@sta/nudm-handler.c.o' -MF 'src/udm/3eca12a@@udm@sta/nudm-handler.c.o.d' -o 'src/udm/3eca12a@@udm@sta/nudm-handler.c.o' -c ../src/udm/nudm-handler.c [ 461s] [1935/2112] cc -Isrc/udm/3eca12a@@udm@sta -Isrc/udm -I../src/udm -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/sbi -I../lib/sbi -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/arm-linux-gnueabihf -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/udm/3eca12a@@udm@sta/nudr-build.c.o' -MF 'src/udm/3eca12a@@udm@sta/nudr-build.c.o.d' -o 'src/udm/3eca12a@@udm@sta/nudr-build.c.o' -c ../src/udm/nudr-build.c [ 461s] [1936/2112] cc -Isrc/udm/3eca12a@@udm@sta -Isrc/udm -I../src/udm -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/sbi -I../lib/sbi -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/arm-linux-gnueabihf -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/udm/3eca12a@@udm@sta/nnrf-handler.c.o' -MF
Change in osmo-bts[master]: common/scheduler: fix unreachable code in trx_sched_set_lchan()
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18699 ) Change subject: common/scheduler: fix unreachable code in trx_sched_set_lchan() .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie9d8f8ca86195be4408db717cd3194a7d2ddc918 Gerrit-Change-Number: 18699 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Jun 2020 21:30:30 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: remove openbsc from nightly and latest builds
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/18656 ) Change subject: remove openbsc from nightly and latest builds .. remove openbsc from nightly and latest builds The only part that we haven't migrated elsewhere is osmo-bsc_nat, which is also really unmaintained at this point. Let's not confuse people into thinking they should actually use this software anymore. Change-Id: Icee165422a52bfe04be103a5b7ebb5c8909c0321 --- M scripts/osmocom-latest-packages.sh M scripts/osmocom-nightly-packages.sh 2 files changed, 0 insertions(+), 4 deletions(-) Approvals: tnt: Looks good to me, but someone else must approve laforge: Looks good to me, approved; Verified diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh index 46d8a0f..6566951 100755 --- a/scripts/osmocom-latest-packages.sh +++ b/scripts/osmocom-latest-packages.sh @@ -134,7 +134,6 @@ checkout osmo-iuh checkout osmo-ggsn checkout osmo-sgsn - checkout openbsc checkout osmo-pcap checkout osmo-trx checkout osmo-sip-connector @@ -172,7 +171,6 @@ build osmo-iuh build osmo-ggsn build osmo-sgsn - build openbsc build osmo-pcap build osmo-trx build osmo-sip-connector diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index 4a0bc80..0e5dcbf 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -217,7 +217,6 @@ checkout osmo-iuh checkout osmo-ggsn checkout osmo-sgsn - checkout openbsc checkout osmo-pcap checkout osmo-trx checkout osmo-sip-connector @@ -259,7 +258,6 @@ build osmo-iuh build osmo-ggsn build osmo-sgsn - build openbsc build osmo-pcap build osmo-trx build osmo-trx-debian8 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/18656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Icee165422a52bfe04be103a5b7ebb5c8909c0321 Gerrit-Change-Number: 18656 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: merged
Change in docker-playground[master]: ttcn3-bts-test/jenkins.sh: stop container with BSC in the end
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/18695 ) Change subject: ttcn3-bts-test/jenkins.sh: stop container with BSC in the end .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/docker-playground/+/18695/1/ttcn3-bts-test/jenkins.sh File ttcn3-bts-test/jenkins.sh: https://gerrit.osmocom.org/c/docker-playground/+/18695/1/ttcn3-bts-test/jenkins.sh@151 PS1, Line 151: docker container kill ${BUILD_TAG}-bsc actually, the container is killed above in line #139 when we set-up the OML tests which already run without the BSC. Sure, we can add the line if you prefer, but I really don't see any bug here. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/18695 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia383febb3ca7ae6263853c68dc7b6d8700612b01 Gerrit-Change-Number: 18695 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 05 Jun 2020 20:58:47 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-ci[master]: remove openbsc from nightly and latest builds
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/18656 ) Change subject: remove openbsc from nightly and latest builds .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/18656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Icee165422a52bfe04be103a5b7ebb5c8909c0321 Gerrit-Change-Number: 18656 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Fri, 05 Jun 2020 20:59:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: bts-trx: phy_link: Improve logging fmt in phy_link_state_set()
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18646 ) Change subject: bts-trx: phy_link: Improve logging fmt in phy_link_state_set() .. bts-trx: phy_link: Improve logging fmt in phy_link_state_set() Change-Id: I4633dd81d0b4cc104ca9e0803993ba766cb23790 --- M include/osmo-bts/phy_link.h M src/common/phy_link.c 2 files changed, 16 insertions(+), 9 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmo-bts/phy_link.h b/include/osmo-bts/phy_link.h index cf877bd..2bed8ea 100644 --- a/include/osmo-bts/phy_link.h +++ b/include/osmo-bts/phy_link.h @@ -157,6 +157,7 @@ struct phy_link *phy_link_by_num(int num); struct phy_link *phy_link_create(void *ctx, int num); void phy_link_destroy(struct phy_link *plink); +const char *phy_link_name(struct phy_link *plink); void phy_link_state_set(struct phy_link *plink, enum phy_link_state state); enum phy_link_state phy_link_state_get(struct phy_link *plink); const char *phy_link_state_name(enum phy_link_state state); @@ -178,4 +179,5 @@ int bts_model_phy_link_open(struct phy_link *plink); +#define LOGPPHL(plink, section, lvl, fmt, args...) LOGP(section, lvl, "%s: " fmt, phy_link_name(plink), ##args) #define LOGPPHI(pinst, section, lvl, fmt, args...) LOGP(section, lvl, "%s: " fmt, phy_instance_name(pinst), ##args) diff --git a/src/common/phy_link.c b/src/common/phy_link.c index 85f9e14..38819eb 100644 --- a/src/common/phy_link.c +++ b/src/common/phy_link.c @@ -53,9 +53,9 @@ { struct phy_instance *pinst; - LOGP(DL1C, LOGL_INFO, "PHY link state change %s -> %s\n", -get_value_string(phy_link_state_vals, plink->state), -get_value_string(phy_link_state_vals, state)); + LOGPPHL(plink, DL1C, LOGL_INFO, "PHY link state change %s -> %s\n", + get_value_string(phy_link_state_vals, plink->state), + get_value_string(phy_link_state_vals, state)); /* notify all TRX associated with this phy */ llist_for_each_entry(pinst, >instances, list) { @@ -65,11 +65,11 @@ switch (state) { case PHY_LINK_CONNECTED: - LOGP(DL1C, LOGL_INFO, "trx_set_avail(1)\n"); + LOGPPHI(pinst, DL1C, LOGL_INFO, "trx_set_avail(1)\n"); trx_set_available(trx, 1); break; case PHY_LINK_SHUTDOWN: - LOGP(DL1C, LOGL_INFO, "trx_set_avail(0)\n"); + LOGPPHI(pinst, DL1C, LOGL_INFO, "trx_set_avail(0)\n"); trx_set_available(trx, 0); break; case PHY_LINK_CONNECTING: @@ -148,6 +148,13 @@ talloc_free(plink); } +static char name_buf[32]; +const char *phy_link_name(struct phy_link *plink) +{ + snprintf(name_buf, sizeof(name_buf), "phy%u", plink->num); + return name_buf; +} + int phy_links_open(void) { struct phy_link *plink; @@ -165,9 +172,7 @@ const char *phy_instance_name(struct phy_instance *pinst) { - static char buf[32]; - - snprintf(buf, sizeof(buf), "phy%u.%u", pinst->phy_link->num, + snprintf(name_buf, sizeof(name_buf), "phy%u.%u", pinst->phy_link->num, pinst->num); - return buf; + return name_buf; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18646 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4633dd81d0b4cc104ca9e0803993ba766cb23790 Gerrit-Change-Number: 18646 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-bts[master]: bts-trx: phy_link: Improve logging fmt in phy_link_state_set()
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18646 ) Change subject: bts-trx: phy_link: Improve logging fmt in phy_link_state_set() .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18646 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4633dd81d0b4cc104ca9e0803993ba766cb23790 Gerrit-Change-Number: 18646 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 05 Jun 2020 20:57:05 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: doc/examples: remove virtual/openbsc-virtual.cfg
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18681 ) Change subject: doc/examples: remove virtual/openbsc-virtual.cfg .. doc/examples: remove virtual/openbsc-virtual.cfg This is not the right place to ship configuration examples for other projects, and definitely not for abandoned ones. Change-Id: Ib165b16f948126df8023bb42ad5d6d4b2fc11e6a --- M contrib/osmo-bts.spec.in M debian/osmo-bts-virtual.install M doc/examples/Makefile.am D doc/examples/virtual/openbsc-virtual.cfg 4 files changed, 1 insertion(+), 155 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/osmo-bts.spec.in b/contrib/osmo-bts.spec.in index c155921..66213ff 100644 --- a/contrib/osmo-bts.spec.in +++ b/contrib/osmo-bts.spec.in @@ -99,7 +99,6 @@ %{_docdir}/%{name}/examples/osmo-bts-trx/osmo-bts-trx-calypso.cfg %{_docdir}/%{name}/examples/osmo-bts-trx/osmo-bts-trx.cfg %dir %{_docdir}/%{name}/examples/osmo-bts-virtual -%{_docdir}/%{name}/examples/osmo-bts-virtual/openbsc-virtual.cfg %{_docdir}/%{name}/examples/osmo-bts-virtual/osmo-bts-virtual.cfg %{_bindir}/osmo-bts-trx %dir %{_sysconfdir}/osmocom diff --git a/debian/osmo-bts-virtual.install b/debian/osmo-bts-virtual.install index f4d988f..63cc425 100644 --- a/debian/osmo-bts-virtual.install +++ b/debian/osmo-bts-virtual.install @@ -3,4 +3,3 @@ usr/bin/osmo-bts-virtual usr/bin/osmo-bts-omldummy usr/share/doc/osmo-bts/examples/osmo-bts-virtual/osmo-bts-virtual.cfg -usr/share/doc/osmo-bts/examples/osmo-bts-virtual/openbsc-virtual.cfg diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 3799069..25a2151 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -2,8 +2,7 @@ doc_virtualdir = $(docdir)/examples/osmo-bts-virtual doc_virtual_DATA = \ -virtual/osmo-bts-virtual.cfg \ -virtual/openbsc-virtual.cfg +virtual/osmo-bts-virtual.cfg EXTRA_DIST = $(doc_virtual_DATA) if ENABLE_SYSMOBTS diff --git a/doc/examples/virtual/openbsc-virtual.cfg b/doc/examples/virtual/openbsc-virtual.cfg deleted file mode 100644 index be79d58..000 --- a/doc/examples/virtual/openbsc-virtual.cfg +++ /dev/null @@ -1,151 +0,0 @@ -! -! OpenBSC (0.15.0.629-34f0-dirty) configuration saved from vty -!! -! -log stderr - logging filter all 1 - logging color 0 - logging print category 1 - logging timestamp 1 - logging level all info - logging level rll notice - logging level cc notice - logging level mm debug - logging level rr notice - logging level rsl notice - logging level nm info - logging level mncc notice - logging level pag notice - logging level meas notice - logging level sccp notice - logging level msc notice - logging level mgcp notice - logging level ho notice - logging level db notice - logging level ref notice - logging level gprs debug - logging level ns info - logging level bssgp debug - logging level llc debug - logging level sndcp debug - logging level nat notice - logging level ctrl notice - logging level smpp debug - logging level filter debug - logging level ranap debug - logging level sua debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice -! -stats interval 5 -! -line vty - no login -! -e1_input - e1_line 0 driver ipa - e1_line 0 port 0 - no e1_line 0 keepalive -network - network country code 262 - mobile network code 42 - short name OpenBSC - long name OpenBSC - auth policy accept-all - authorized-regexp .* - location updating reject cause 13 - encryption a5 0 - neci 1 - paging any use tch 0 - rrlp mode ms-based - mm info 1 - handover 0 - handover window rxlev averaging 10 - handover window rxqual averaging 1 - handover window rxlev neighbor averaging 10 - handover power budget interval 6 - handover power budget hysteresis 3 - handover maximum distance - timer t3101 10 - timer t3103 0 - timer t3105 0 - timer t3107 0 - timer t3109 4 - timer t3111 0 - timer t3113 60 - timer t3115 0 - timer t3117 0 - timer t3119 0 - timer t3122 10 - timer t3141 0 - subscriber-keep-in-ram 0 - bts 0 - type sysmobts - band DCS1800 - cell_identity 6969 - location_area_code 1 - base_station_id_code 63 - ms max power 0 - cell reselection hysteresis 4 - rxlev access min 0 - periodic location update 30 - radio-link-timeout 32 - channel allocator descending - rach tx integer 9 - rach max transmission 7 - channel-descrption attach 1 - channel-descrption bs-pa-mfrms 5 - channel-descrption bs-ag-blks-res 1 - ip.access unit_id 6969 0 - oml ip.access stream_id 255 line 0 - neighbor-list mode automatic - codec-support fr - gprs mode none - no force-combined-si - trx 0 - rf_locked
Change in osmo-ttcn3-hacks[master]: BTS_Tests: fix f_init_rsl(): expect all 4 transceivers to connect
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18633 ) Change subject: BTS_Tests: fix f_init_rsl(): expect all 4 transceivers to connect .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18633 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: I32bb6d37929cde420a547e18eeb2f940e833316b Gerrit-Change-Number: 18633 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Jun 2020 20:55:36 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: BTS_Tests: fix f_init_rsl(): expect all 4 transceivers to connect
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18633 ) Change subject: BTS_Tests: fix f_init_rsl(): expect all 4 transceivers to connect .. BTS_Tests: fix f_init_rsl(): expect all 4 transceivers to connect Fixes TC_paging_{imsi,tmsi}_{200,80}percent test cases. Change-Id: I32bb6d37929cde420a547e18eeb2f940e833316b Related: OS#4546 --- M bts/BTS_Tests.ttcn 1 file changed, 28 insertions(+), 18 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Verified laforge: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 80804ec..e3d4beb 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -118,6 +118,7 @@ var RSL_Emulation_CT vc_RSL; /* Direct RSL_CCHAN_PT */ port RSL_CCHAN_PT RSL_CCHAN; + timer g_rslem_up_timer; /* L1CTL port (for classic tests) */ port L1CTL_PT L1CTL; @@ -180,9 +181,14 @@ port PCUIF_CODEC_PT PCU; } -function f_init_rsl(charstring id) runs on test_CT { - timer T := mp_ipa_up_timeout; +private altstep as_rsl_init_guard() runs on test_CT { + [] g_rslem_up_timer.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Timeout waiting for RSL bring up"); + } +} +function f_init_rsl(charstring id) runs on test_CT { vc_IPA := IPA_Emulation_CT.create(id & "-RSL-IPA"); vc_RSL := RSL_Emulation_CT.create(id & "-RSL"); @@ -193,14 +199,27 @@ vc_IPA.start(IPA_Emulation.main_server(mp_rsl_ip, mp_rsl_port)); vc_RSL.start(RSL_Emulation.main(false)); - T.start; - alt { - /* TODO: handle connection events from multiple transceivers */ - [] RSL_CCHAN.receive(tr_RSLEm_EV(RSLEM_EV_TRX_UP)); - [] T.timeout { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for ASP_IPA_EVENT_UP"); - } + /* TTCN-3 offers no way to guard 'interleave' statements */ + g_rslem_up_timer.start(mp_ipa_up_timeout); + var default d := activate(as_rsl_init_guard()); + + /* We expect all 4 transceivers to connect here (separate IPA/RSL connections). +* See https://gerrit.osmocom.org/q/Ib5ad31388ae25399ad09739aac3fdcb0b3a1f78b. */ + interleave { + /* These events are sent by the RSL_Emulation_CT */ + [] RSL_CCHAN.receive(tr_RSLEm_EV(RSLEM_EV_TRX_UP, IPAC_PROTO_RSL_TRX0)); + [] RSL_CCHAN.receive(tr_RSLEm_EV(RSLEM_EV_TRX_UP, IPAC_PROTO_RSL_TRX1)); + [] RSL_CCHAN.receive(tr_RSLEm_EV(RSLEM_EV_TRX_UP, IPAC_PROTO_RSL_TRX2)); + [] RSL_CCHAN.receive(tr_RSLEm_EV(RSLEM_EV_TRX_UP, IPAC_PROTO_RSL_TRX3)); + /* These messages (RF RESource INDication) are sent by the IUT itself */ + [] RSL_CCHAN.receive(tr_ASP_RSL_UD(tr_RSL_RF_RES_IND, IPAC_PROTO_RSL_TRX0)); + [] RSL_CCHAN.receive(tr_ASP_RSL_UD(tr_RSL_RF_RES_IND, IPAC_PROTO_RSL_TRX1)); + [] RSL_CCHAN.receive(tr_ASP_RSL_UD(tr_RSL_RF_RES_IND, IPAC_PROTO_RSL_TRX2)); + [] RSL_CCHAN.receive(tr_ASP_RSL_UD(tr_RSL_RF_RES_IND, IPAC_PROTO_RSL_TRX3)); } + + g_rslem_up_timer.stop; + deactivate(d); } type record ConnHdlrPars { @@ -2956,13 +2975,6 @@ integer num_overload } -/* receive + ignore RSL RF RES IND */ -altstep as_rsl_res_ind() runs on test_CT { - [] RSL_CCHAN.receive(tr_ASP_RSL_UD(tr_RSL_RF_RES_IND)) { - repeat; - } -} - /* Helper function for paging related testing */ private function f_TC_paging(PagingTestCfg cfg) runs on test_CT return PagingTestState { f_init(); @@ -3045,7 +3057,6 @@ } } [] T_total.timeout { } - [] as_rsl_res_ind(); } } @@ -3061,7 +3072,6 @@ [] T_wait.timeout { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Waiting for empty paging queue"); } - [] as_rsl_res_ind(); } log("num_paging_sent=", st.num_paging_sent, " rcvd_msgs=", st.num_paging_rcv_msgs, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18633 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: I32bb6d37929cde420a547e18eeb2f940e833316b Gerrit-Change-Number: 18633 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-bts[master]: osmo-bts-trx: prettify Makefile.am: make it git friendly
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18696 ) Change subject: osmo-bts-trx: prettify Makefile.am: make it git friendly .. osmo-bts-trx: prettify Makefile.am: make it git friendly Change-Id: I0991910e0ffa6140f20c49bd2f0ad9b42cf231ba --- M src/osmo-bts-trx/Makefile.am 1 file changed, 48 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/Makefile.am b/src/osmo-bts-trx/Makefile.am index 1922240..85c1ff4 100644 --- a/src/osmo-bts-trx/Makefile.am +++ b/src/osmo-bts-trx/Makefile.am @@ -1,10 +1,52 @@ -AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS = -Wall -fno-strict-aliasing $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOCODING_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBOSMOCTRL_CFLAGS) -LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOCODING_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOCTRL_LIBS) -ldl +AM_CPPFLAGS = \ + $(all_includes) \ + -I$(top_srcdir)/include \ + $(NULL) -EXTRA_DIST = trx_if.h l1_if.h loops.h +AM_CFLAGS = \ + -Wall -fno-strict-aliasing \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOCODEC_CFLAGS) \ + $(LIBOSMOCODING_CFLAGS) \ + $(LIBOSMOVTY_CFLAGS) \ + $(LIBOSMOTRAU_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ + $(LIBOSMOCTRL_CFLAGS) \ + $(NULL) + +LDADD = \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOCODEC_LIBS) \ + $(LIBOSMOCODING_LIBS) \ + $(LIBOSMOVTY_LIBS) \ + $(LIBOSMOTRAU_LIBS) \ + $(LIBOSMOABIS_LIBS) \ + $(LIBOSMOCTRL_LIBS) \ + -ldl \ + $(NULL) + +# TODO: use noinst_HEADERS instead? +EXTRA_DIST = \ + trx_if.h \ + l1_if.h \ + loops.h \ + $(NULL) bin_PROGRAMS = osmo-bts-trx -osmo_bts_trx_SOURCES = main.c trx_if.c l1_if.c scheduler_trx.c trx_vty.c loops.c -osmo_bts_trx_LDADD = $(top_builddir)/src/common/libl1sched.a $(top_builddir)/src/common/libbts.a $(LDADD) +osmo_bts_trx_SOURCES = \ + main.c \ + trx_if.c \ + l1_if.c \ + scheduler_trx.c \ + trx_vty.c \ + loops.c \ + $(NULL) + +osmo_bts_trx_LDADD = \ + $(top_builddir)/src/common/libl1sched.a \ + $(top_builddir)/src/common/libbts.a \ + $(LDADD) \ + $(NULL) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18696 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0991910e0ffa6140f20c49bd2f0ad9b42cf231ba Gerrit-Change-Number: 18696 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-bts[master]: osmo-bts-virtual: cosmetic: use LID_{SACCH, DEDIC} macros
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18698 ) Change subject: osmo-bts-virtual: cosmetic: use LID_{SACCH,DEDIC} macros .. osmo-bts-virtual: cosmetic: use LID_{SACCH,DEDIC} macros Change-Id: Idd37ca9ebf0d483cbea6f0e992211b9c3e2af993 --- M src/osmo-bts-virtual/l1_if.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo-bts-virtual/l1_if.c b/src/osmo-bts-virtual/l1_if.c index c5c526c..289ef40 100644 --- a/src/osmo-bts-virtual/l1_if.c +++ b/src/osmo-bts-virtual/l1_if.c @@ -437,12 +437,12 @@ break; } /* deactivate associated channel */ - trx_sched_set_lchan(sched, chan_nr, 0x40, 0); + trx_sched_set_lchan(sched, chan_nr, LID_SACCH, 0); if (!l1sap->u.info.u.act_req.sacch_only) { /* set lchan inactive */ lchan_set_state(lchan, LCHAN_S_NONE); /* deactivate dedicated channel */ - trx_sched_set_lchan(sched, chan_nr, 0x00, 0); + trx_sched_set_lchan(sched, chan_nr, LID_DEDIC, 0); /* confirm only on dedicated channel */ mph_info_chan_confirm(trx, chan_nr, PRIM_INFO_DEACTIVATE, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18698 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idd37ca9ebf0d483cbea6f0e992211b9c3e2af993 Gerrit-Change-Number: 18698 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-bts[master]: osmo-bts-trx: fix: use noinst_HEADERS instead of EXTRA_DIST
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18697 ) Change subject: osmo-bts-trx: fix: use noinst_HEADERS instead of EXTRA_DIST .. osmo-bts-trx: fix: use noinst_HEADERS instead of EXTRA_DIST Change-Id: I3c2fa21baae64e6537a2c74b97f1108b84099064 --- M src/osmo-bts-trx/Makefile.am 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/Makefile.am b/src/osmo-bts-trx/Makefile.am index 85c1ff4..b2d9b19 100644 --- a/src/osmo-bts-trx/Makefile.am +++ b/src/osmo-bts-trx/Makefile.am @@ -27,8 +27,7 @@ -ldl \ $(NULL) -# TODO: use noinst_HEADERS instead? -EXTRA_DIST = \ +noinst_HEADERS = \ trx_if.h \ l1_if.h \ loops.h \ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3c2fa21baae64e6537a2c74b97f1108b84099064 Gerrit-Change-Number: 18697 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-bts[master]: common/scheduler: use boolean for channel activation state
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18700 ) Change subject: common/scheduler: use boolean for channel activation state .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0cb1d915db8787050cdec1802894f66e885a9bf3 Gerrit-Change-Number: 18700 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 05 Jun 2020 20:54:30 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: rsl: refactor handling of RSL_IE_MR_CONFIG
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18680 ) Change subject: rsl: refactor handling of RSL_IE_MR_CONFIG .. rsl: refactor handling of RSL_IE_MR_CONFIG - get rid of gsm_lchan::mr_bts_lv, it's never used anyway, - check IE length in amr_parse_mr_conf() before parsing, - check return code of amr_parse_mr_conf(). Change-Id: Ibfd5845ea429945b352dd14421e86562998d65ca --- M include/osmo-bts/gsm_data_shared.h M src/common/amr.c M src/common/rsl.c 3 files changed, 20 insertions(+), 21 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h index f010dbc..dc7d39f 100644 --- a/include/osmo-bts/gsm_data_shared.h +++ b/include/osmo-bts/gsm_data_shared.h @@ -157,9 +157,6 @@ uint8_t key[MAX_A5_KEY_LEN]; } encr; - /* AMR bits */ - uint8_t mr_bts_lv[7]; - struct { uint32_t bound_ip; uint32_t connect_ip; diff --git a/src/common/amr.c b/src/common/amr.c index 05d1aaa..837757f 100644 --- a/src/common/amr.c +++ b/src/common/amr.c @@ -78,13 +78,16 @@ int amr_parse_mr_conf(struct amr_multirate_conf *amr_mrc, const uint8_t *mr_conf, unsigned int len) { - uint8_t mr_version = mr_conf[0] >> 5; uint8_t num_codecs = 0; int i, j = 0; - if (mr_version != 1) { - LOGP(DRSL, LOGL_ERROR, "AMR Multirate Version %u unknown\n", - mr_version); + if (len < 2) { + LOGP(DRSL, LOGL_ERROR, "AMR Multirate IE is too short (%u)\n", len); + goto ret_einval; + } + + if ((mr_conf[0] >> 5) != 1) { + LOGP(DRSL, LOGL_ERROR, "AMR Multirate Version %u unknown\n", (mr_conf[0] >> 5)); goto ret_einval; } diff --git a/src/common/rsl.c b/src/common/rsl.c index 41dd243..f057a89 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1209,17 +1209,16 @@ } /* 9.3.52 MultiRate Configuration */ if (TLVP_PRESENT(, RSL_IE_MR_CONFIG)) { - if (TLVP_LEN(, RSL_IE_MR_CONFIG) > sizeof(lchan->mr_bts_lv) - 1) { + rc = amr_parse_mr_conf(>tch.amr_mr, + TLVP_VAL(, RSL_IE_MR_CONFIG), + TLVP_LEN(, RSL_IE_MR_CONFIG)); + if (rc < 0) { LOGPLCHAN(lchan, DRSL, LOGL_ERROR, "Error parsing MultiRate conf IE\n"); rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, >chan_nr, NULL, msg); return rsl_tx_chan_act_acknack(lchan, RSL_ERR_IE_CONTENT); } - memcpy(lchan->mr_bts_lv, TLVP_VAL(, RSL_IE_MR_CONFIG) - 1, - TLVP_LEN(, RSL_IE_MR_CONFIG) + 1); - amr_parse_mr_conf(>tch.amr_mr, TLVP_VAL(, RSL_IE_MR_CONFIG), - TLVP_LEN(, RSL_IE_MR_CONFIG)); - amr_log_mr_conf(DRTP, LOGL_DEBUG, gsm_lchan_name(lchan), - >tch.amr_mr); + + amr_log_mr_conf(DRTP, LOGL_DEBUG, gsm_lchan_name(lchan), >tch.amr_mr); lchan->tch.last_cmr = AMR_CMR_NONE; } /* 9.3.53 MultiRate Control */ @@ -1556,6 +1555,7 @@ struct gsm_lchan *lchan = msg->lchan; struct rsl_ie_chan_mode *cm; struct tlv_parsed tp; + int rc; rsl_tlv_parse(, msgb_l3(msg), msgb_l3len(msg)); @@ -1588,17 +1588,16 @@ /* 9.3.52 MultiRate Configuration */ if (TLVP_PRESENT(, RSL_IE_MR_CONFIG)) { - if (TLVP_LEN(, RSL_IE_MR_CONFIG) > sizeof(lchan->mr_bts_lv) - 1) { + rc = amr_parse_mr_conf(>tch.amr_mr, + TLVP_VAL(, RSL_IE_MR_CONFIG), + TLVP_LEN(, RSL_IE_MR_CONFIG)); + if (rc < 0) { LOGPLCHAN(lchan, DRSL, LOGL_ERROR, "Error parsing MultiRate conf IE\n"); rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, >chan_nr, NULL, msg); return rsl_tx_mode_modif_nack(lchan, RSL_ERR_IE_CONTENT);; } - memcpy(lchan->mr_bts_lv, TLVP_VAL(, RSL_IE_MR_CONFIG) - 1, - TLVP_LEN(, RSL_IE_MR_CONFIG) + 1); - amr_parse_mr_conf(>tch.amr_mr, TLVP_VAL(, RSL_IE_MR_CONFIG), - TLVP_LEN(, RSL_IE_MR_CONFIG)); - amr_log_mr_conf(DRTP, LOGL_DEBUG, gsm_lchan_name(lchan), - >tch.amr_mr); + + amr_log_mr_conf(DRTP, LOGL_DEBUG, gsm_lchan_name(lchan), >tch.amr_mr); lchan->tch.last_cmr = AMR_CMR_NONE; } /* 9.3.53 MultiRate Control */ -- To view,
Change in osmo-bts[master]: osmo-bts-trx: fix: use noinst_HEADERS instead of EXTRA_DIST
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18697 ) Change subject: osmo-bts-trx: fix: use noinst_HEADERS instead of EXTRA_DIST .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3c2fa21baae64e6537a2c74b97f1108b84099064 Gerrit-Change-Number: 18697 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 05 Jun 2020 20:53:21 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: osmo-bts-virtual: cosmetic: use LID_{SACCH, DEDIC} macros
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18698 ) Change subject: osmo-bts-virtual: cosmetic: use LID_{SACCH,DEDIC} macros .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18698 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idd37ca9ebf0d483cbea6f0e992211b9c3e2af993 Gerrit-Change-Number: 18698 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 05 Jun 2020 20:53:35 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: osmo-bts-trx: prettify Makefile.am: make it git friendly
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18696 ) Change subject: osmo-bts-trx: prettify Makefile.am: make it git friendly .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18696 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0991910e0ffa6140f20c49bd2f0ad9b42cf231ba Gerrit-Change-Number: 18696 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 05 Jun 2020 20:53:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gsm0808: fix endieness of call identifier
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/18694 ) Change subject: gsm0808: fix endieness of call identifier .. Patch Set 1: Code-Review-1 > Patch Set 1: > > > Patch Set 1: > > > > I'm not convinced (yet). Normally, we pass values around in host byte > > order and only translate them to network byte order when generating > > messages. > > > > So why is that value already in netwokr byte order? Why can the caller not > > provide it in host byte order? > > > > Also, if we really want function arguments are not in native (host) byte > > order, I think it must clearly be documented in the doxygen part. > > Hmm. I have checked it multiple times now. Network byte order is big endien, > x86er is little endien. However 3GPP TS 48.008, section 3.2.2.105 wants the > least significant byte transmitted first. I think thats why the endieness > should already match the host byte order here. Thanks for pointing this out. That's of course quite unusual (probably a bug in the spec that was only discovered when it was too late and now everyone has to send little-endian uint32_t in a protocol that otherwise is always big-endian). But even in that case your patch is wrong. You need to do a portable conversion from host endianness (which can be either little or big) to little-endian. This conversion is so uncommon that we don't even have a libosmocore function for it. In the kernel there are macros like cpu_to_le32(x), but we don't have that. I guess you have to #include osmocom/core/endian.h and then do an #ifndef OSMO_IS_LITTLE_ENDIAN #else #endif clause. If the host is not LITTLE_ENDIAN, you need to do an osmo_swab32(). If the host is little endian, then nothing. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/18694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6468e502f552f99ab54aec9d4b1c169fdc0adfb8 Gerrit-Change-Number: 18694 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 05 Jun 2020 20:52:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: rsl: refactor handling of RSL_IE_MR_CONFIG
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18680 ) Change subject: rsl: refactor handling of RSL_IE_MR_CONFIG .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibfd5845ea429945b352dd14421e86562998d65ca Gerrit-Change-Number: 18680 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Jun 2020 20:52:50 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: osmo-bts-virtual: cosmetic: use LID_{SACCH, DEDIC} macros
fixeria has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-bts/+/18698 ) Change subject: osmo-bts-virtual: cosmetic: use LID_{SACCH,DEDIC} macros .. osmo-bts-virtual: cosmetic: use LID_{SACCH,DEDIC} macros Change-Id: Idd37ca9ebf0d483cbea6f0e992211b9c3e2af993 --- M src/osmo-bts-virtual/l1_if.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/98/18698/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18698 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idd37ca9ebf0d483cbea6f0e992211b9c3e2af993 Gerrit-Change-Number: 18698 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: common/scheduler: use boolean for channel activation state
fixeria has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-bts/+/18700 ) Change subject: common/scheduler: use boolean for channel activation state .. common/scheduler: use boolean for channel activation state Change-Id: I0cb1d915db8787050cdec1802894f66e885a9bf3 --- M include/osmo-bts/scheduler.h M src/common/scheduler.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-virtual/l1_if.c 4 files changed, 12 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/00/18700/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0cb1d915db8787050cdec1802894f66e885a9bf3 Gerrit-Change-Number: 18700 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: osmo-bts-virtual: cosmetic: use LID_SACCH instead of 0x40
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/18698 ) Change subject: osmo-bts-virtual: cosmetic: use LID_SACCH instead of 0x40 .. osmo-bts-virtual: cosmetic: use LID_SACCH instead of 0x40 Change-Id: Idd37ca9ebf0d483cbea6f0e992211b9c3e2af993 --- M src/osmo-bts-virtual/l1_if.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/98/18698/1 diff --git a/src/osmo-bts-virtual/l1_if.c b/src/osmo-bts-virtual/l1_if.c index c5c526c..31ed46d 100644 --- a/src/osmo-bts-virtual/l1_if.c +++ b/src/osmo-bts-virtual/l1_if.c @@ -437,7 +437,7 @@ break; } /* deactivate associated channel */ - trx_sched_set_lchan(sched, chan_nr, 0x40, 0); + trx_sched_set_lchan(sched, chan_nr, LID_SACCH, 0); if (!l1sap->u.info.u.act_req.sacch_only) { /* set lchan inactive */ lchan_set_state(lchan, LCHAN_S_NONE); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18698 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idd37ca9ebf0d483cbea6f0e992211b9c3e2af993 Gerrit-Change-Number: 18698 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
Change in osmo-bts[master]: common/scheduler: use boolean for channel activation state
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/18700 ) Change subject: common/scheduler: use boolean for channel activation state .. common/scheduler: use boolean for channel activation state Change-Id: I0cb1d915db8787050cdec1802894f66e885a9bf3 --- M include/osmo-bts/scheduler.h M src/common/scheduler.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-virtual/l1_if.c 4 files changed, 12 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/00/18700/1 diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h index 7a9da8f..74102f3 100644 --- a/include/osmo-bts/scheduler.h +++ b/include/osmo-bts/scheduler.h @@ -72,7 +72,7 @@ /* States each channel on a multiframe */ struct l1sched_chan_state { /* scheduler */ - uint8_t active; /* Channel is active */ + boolactive; /* Channel is active */ ubit_t *dl_bursts; /* burst buffer for TX */ enum trx_burst_type dl_burst_type; /* GMSK or 8PSK burst type */ sbit_t *ul_bursts; /* burst buffer for RX */ @@ -175,8 +175,7 @@ enum gsm_phys_chan_config pchan); /*! \brief set all matching logical channels active/inactive */ -int trx_sched_set_lchan(struct l1sched_trx *l1t, uint8_t chan_nr, uint8_t link_id, - int active); +int trx_sched_set_lchan(struct l1sched_trx *l1t, uint8_t chan_nr, uint8_t link_id, bool active); /*! \brief set mode of all matching logical channels to given mode(s) */ int trx_sched_set_mode(struct l1sched_trx *l1t, uint8_t chan_nr, uint8_t rsl_cmode, diff --git a/src/common/scheduler.c b/src/common/scheduler.c index 276f3fd..5b398d1 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -586,7 +586,7 @@ for (i = 0; i < ARRAY_SIZE(l1ts->chan_state); i++) { struct l1sched_chan_state *chan_state; chan_state = >chan_state[i]; - chan_state->active = 0; + chan_state->active = false; } } @@ -960,8 +960,7 @@ } /* setting all logical channels given attributes to active/inactive */ -int trx_sched_set_lchan(struct l1sched_trx *l1t, uint8_t chan_nr, uint8_t link_id, - int active) +int trx_sched_set_lchan(struct l1sched_trx *l1t, uint8_t chan_nr, uint8_t link_id, bool active) { uint8_t tn = L1SAP_CHAN2TS(chan_nr); struct l1sched_ts *l1ts = l1sched_trx_get_ts(l1t, tn); diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index b28c894..b67d8fa 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -128,16 +128,14 @@ /* set lchan inactive */ lchan_set_state(lchan, LCHAN_S_NONE); - return trx_sched_set_lchan(>l1s, gsm_lchan2chan_nr(lchan), - LID_DEDIC, 0); + return trx_sched_set_lchan(>l1s, gsm_lchan2chan_nr(lchan), LID_DEDIC, false); } int bts_model_lchan_deactivate_sacch(struct gsm_lchan *lchan) { struct phy_instance *pinst = trx_phy_instance(lchan->ts->trx); struct trx_l1h *l1h = pinst->u.osmotrx.hdl; - return trx_sched_set_lchan(>l1s, gsm_lchan2chan_nr(lchan), - LID_SACCH, 0); + return trx_sched_set_lchan(>l1s, gsm_lchan2chan_nr(lchan), LID_SACCH, false); } static void l1if_setslot_cb(struct trx_l1h *l1h, uint8_t tn, uint8_t type, int rc) @@ -632,9 +630,9 @@ chan_nr = RSL_CHAN_OSMO_PDCH | (chan_nr & ~RSL_CHAN_NR_MASK); /* activate dedicated channel */ - trx_sched_set_lchan(>l1s, chan_nr, LID_DEDIC, 1); + trx_sched_set_lchan(>l1s, chan_nr, LID_DEDIC, true); /* activate associated channel */ - trx_sched_set_lchan(>l1s, chan_nr, LID_SACCH, 1); + trx_sched_set_lchan(>l1s, chan_nr, LID_SACCH, true); /* set mode */ trx_sched_set_mode(>l1s, chan_nr, lchan->rsl_cmode, lchan->tch_mode, diff --git a/src/osmo-bts-virtual/l1_if.c b/src/osmo-bts-virtual/l1_if.c index 31ed46d..5d3baf6 100644 --- a/src/osmo-bts-virtual/l1_if.c +++ b/src/osmo-bts-virtual/l1_if.c @@ -388,9 +388,9 @@ break; } /* activate dedicated channel */ - trx_sched_set_lchan(sched, chan_nr, LID_DEDIC, 1); + trx_sched_set_lchan(sched, chan_nr, LID_DEDIC, true); /* activate associated channel */ -
Change in osmo-bts[master]: common/scheduler: fix unreachable code in trx_sched_set_lchan()
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/18699 ) Change subject: common/scheduler: fix unreachable code in trx_sched_set_lchan() .. common/scheduler: fix unreachable code in trx_sched_set_lchan() Change-Id: Ie9d8f8ca86195be4408db717cd3194a7d2ddc918 --- M src/common/scheduler.c 1 file changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/99/18699/1 diff --git a/src/common/scheduler.c b/src/common/scheduler.c index be3ae42..276f3fd 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -986,9 +986,6 @@ LOGP(DL1C, LOGL_NOTICE, "%s %s on trx=%d ts=%d\n", (active) ? "Activating" : "Deactivating", trx_chan_desc[i].name, l1t->trx->nr, tn); - if (active) - memset(chan_state, 0, sizeof(*chan_state)); - chan_state->active = active; /* free burst memory, to cleanly start with burst 0 */ if (chan_state->dl_bursts) { talloc_free(chan_state->dl_bursts); @@ -998,8 +995,12 @@ talloc_free(chan_state->ul_bursts); chan_state->ul_bursts = NULL; } - if (!active) + + if (active) + memset(chan_state, 0, sizeof(*chan_state)); + else chan_state->ho_rach_detect = 0; + chan_state->active = active; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie9d8f8ca86195be4408db717cd3194a7d2ddc918 Gerrit-Change-Number: 18699 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: library/RSL_Emulation: cosmetic: improve logging messages
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18638 ) Change subject: library/RSL_Emulation: cosmetic: improve logging messages .. library/RSL_Emulation: cosmetic: improve logging messages Change-Id: Iefb6bc96e57822e216f8d8480337e6b4afc4d892 --- M library/RSL_Emulation.ttcn 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/library/RSL_Emulation.ttcn b/library/RSL_Emulation.ttcn index eeb5ed5..9a07417 100644 --- a/library/RSL_Emulation.ttcn +++ b/library/RSL_Emulation.ttcn @@ -183,7 +183,7 @@ return i; } } - log("No Dchan handler for ", comp_ref); + log("No Dchan handler for comp_ref=", comp_ref); return -1; } @@ -196,7 +196,7 @@ return i; } } - log("No Dchan handler for ", trx_nr, chan_nr); + log("No Dchan handler for trx_nr=", trx_nr, " and chan_nr=", chan_nr); return -1; } @@ -209,7 +209,7 @@ return i; } } - log("No Dchan handler for ", ra, fn); + log("No Dchan handler for ra=", ra, " and fn=", fn); return -1; } @@ -226,7 +226,7 @@ } } } - log("No Dchan handler for ", ra, fn); + log("No Dchan handler for ra=", ra, " and fn=", fn); return -1; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18638 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: Iefb6bc96e57822e216f8d8480337e6b4afc4d892 Gerrit-Change-Number: 18638 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-bts[master]: osmo-bts-trx: fix: use noinst_HEADERS instead of EXTRA_DIST
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/18697 ) Change subject: osmo-bts-trx: fix: use noinst_HEADERS instead of EXTRA_DIST .. osmo-bts-trx: fix: use noinst_HEADERS instead of EXTRA_DIST Change-Id: I3c2fa21baae64e6537a2c74b97f1108b84099064 --- M src/osmo-bts-trx/Makefile.am 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/97/18697/1 diff --git a/src/osmo-bts-trx/Makefile.am b/src/osmo-bts-trx/Makefile.am index 85c1ff4..b2d9b19 100644 --- a/src/osmo-bts-trx/Makefile.am +++ b/src/osmo-bts-trx/Makefile.am @@ -27,8 +27,7 @@ -ldl \ $(NULL) -# TODO: use noinst_HEADERS instead? -EXTRA_DIST = \ +noinst_HEADERS = \ trx_if.h \ l1_if.h \ loops.h \ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3c2fa21baae64e6537a2c74b97f1108b84099064 Gerrit-Change-Number: 18697 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
Change in osmo-bts[master]: osmo-bts-trx: fix: use noinst_HEADERS instead of EXTRA_DIST
fixeria has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-bts/+/18697 ) Change subject: osmo-bts-trx: fix: use noinst_HEADERS instead of EXTRA_DIST .. osmo-bts-trx: fix: use noinst_HEADERS instead of EXTRA_DIST Change-Id: I3c2fa21baae64e6537a2c74b97f1108b84099064 --- M src/osmo-bts-trx/Makefile.am 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/97/18697/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3c2fa21baae64e6537a2c74b97f1108b84099064 Gerrit-Change-Number: 18697 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: osmo-bts-trx: prettify Makefile.am: make it git friendly
fixeria has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-bts/+/18696 ) Change subject: osmo-bts-trx: prettify Makefile.am: make it git friendly .. osmo-bts-trx: prettify Makefile.am: make it git friendly Change-Id: I0991910e0ffa6140f20c49bd2f0ad9b42cf231ba --- M src/osmo-bts-trx/Makefile.am 1 file changed, 48 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/96/18696/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18696 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0991910e0ffa6140f20c49bd2f0ad9b42cf231ba Gerrit-Change-Number: 18696 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: osmo-bts-trx: purify Makefile.am: make it git friendly
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/18696 ) Change subject: osmo-bts-trx: purify Makefile.am: make it git friendly .. osmo-bts-trx: purify Makefile.am: make it git friendly Change-Id: I0991910e0ffa6140f20c49bd2f0ad9b42cf231ba --- M src/osmo-bts-trx/Makefile.am 1 file changed, 48 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/96/18696/1 diff --git a/src/osmo-bts-trx/Makefile.am b/src/osmo-bts-trx/Makefile.am index 1922240..85c1ff4 100644 --- a/src/osmo-bts-trx/Makefile.am +++ b/src/osmo-bts-trx/Makefile.am @@ -1,10 +1,52 @@ -AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS = -Wall -fno-strict-aliasing $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOCODING_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBOSMOCTRL_CFLAGS) -LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOCODING_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOCTRL_LIBS) -ldl +AM_CPPFLAGS = \ + $(all_includes) \ + -I$(top_srcdir)/include \ + $(NULL) -EXTRA_DIST = trx_if.h l1_if.h loops.h +AM_CFLAGS = \ + -Wall -fno-strict-aliasing \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOCODEC_CFLAGS) \ + $(LIBOSMOCODING_CFLAGS) \ + $(LIBOSMOVTY_CFLAGS) \ + $(LIBOSMOTRAU_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ + $(LIBOSMOCTRL_CFLAGS) \ + $(NULL) + +LDADD = \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOCODEC_LIBS) \ + $(LIBOSMOCODING_LIBS) \ + $(LIBOSMOVTY_LIBS) \ + $(LIBOSMOTRAU_LIBS) \ + $(LIBOSMOABIS_LIBS) \ + $(LIBOSMOCTRL_LIBS) \ + -ldl \ + $(NULL) + +# TODO: use noinst_HEADERS instead? +EXTRA_DIST = \ + trx_if.h \ + l1_if.h \ + loops.h \ + $(NULL) bin_PROGRAMS = osmo-bts-trx -osmo_bts_trx_SOURCES = main.c trx_if.c l1_if.c scheduler_trx.c trx_vty.c loops.c -osmo_bts_trx_LDADD = $(top_builddir)/src/common/libl1sched.a $(top_builddir)/src/common/libbts.a $(LDADD) +osmo_bts_trx_SOURCES = \ + main.c \ + trx_if.c \ + l1_if.c \ + scheduler_trx.c \ + trx_vty.c \ + loops.c \ + $(NULL) + +osmo_bts_trx_LDADD = \ + $(top_builddir)/src/common/libl1sched.a \ + $(top_builddir)/src/common/libbts.a \ + $(LDADD) \ + $(NULL) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18696 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0991910e0ffa6140f20c49bd2f0ad9b42cf231ba Gerrit-Change-Number: 18696 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
Build failure of network:osmocom:latest/libusrp in Debian_Unstable/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libusrp/Debian_Unstable/x86_64 Package network:osmocom:latest/libusrp failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libusrp Last lines of build log: [ 830s] touch libfx2.lib [ 830s] for obj in delay.rel fx2utils.rel i2c.rel isr.rel timer.rel usb_common.rel; do basename $obj .rel >> libfx2.lib ; done [ 830s] make[4]: Leaving directory '/usr/src/packages/BUILD/firmware/lib' [ 830s] Making all in src [ 830s] make[4]: Entering directory '/usr/src/packages/BUILD/firmware/src' [ 830s] Making all in common [ 830s] make[5]: Entering directory '/usr/src/packages/BUILD/firmware/src/common' [ 830s] srcdir=. ./edit-gpif ./gpif.c usrp_gpif.c usrp_gpif_inline.h [ 830s] /usr/bin/env: 'python': No such file or directory [ 830s] make[5]: *** [Makefile:523: usrp_gpif.c] Error 127 [ 830s] make[5]: Leaving directory '/usr/src/packages/BUILD/firmware/src/common' [ 830s] make[4]: *** [Makefile:405: all-recursive] Error 1 [ 830s] make[4]: Leaving directory '/usr/src/packages/BUILD/firmware/src' [ 830s] make[3]: *** [Makefile:405: all-recursive] Error 1 [ 830s] make[3]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 830s] make[2]: *** [Makefile:626: all-recursive] Error 1 [ 830s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 830s] make[1]: *** [Makefile:547: all] Error 2 [ 830s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 830s] dh_auto_build: error: make -j1 returned exit code 2 [ 830s] make: *** [debian/rules:13: build] Error 25 [ 830s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 830s] ### VM INTERACTION START ### [ 834s] [ 791.344599] sysrq: SysRq : Power Off [ 834s] [ 791.354272] reboot: Power down [ 834s] ### VM INTERACTION END ### [ 834s] [ 834s] lamb03 failed "build libusrp_3.4.4.dsc" at Fri Jun 5 16:57:02 UTC 2020. [ 834s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/libusrp in Debian_Unstable/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/Debian_Unstable/x86_64 Package network:osmocom:nightly/libusrp failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 144s] touch libfx2.lib [ 144s] for obj in delay.rel fx2utils.rel i2c.rel isr.rel timer.rel usb_common.rel; do basename $obj .rel >> libfx2.lib ; done [ 144s] make[4]: Leaving directory '/usr/src/packages/BUILD/firmware/lib' [ 144s] Making all in src [ 144s] make[4]: Entering directory '/usr/src/packages/BUILD/firmware/src' [ 144s] Making all in common [ 144s] make[5]: Entering directory '/usr/src/packages/BUILD/firmware/src/common' [ 144s] srcdir=. ./edit-gpif ./gpif.c usrp_gpif.c usrp_gpif_inline.h [ 144s] /usr/bin/env: 'python': No such file or directory [ 144s] make[5]: *** [Makefile:523: usrp_gpif.c] Error 127 [ 144s] make[5]: Leaving directory '/usr/src/packages/BUILD/firmware/src/common' [ 144s] make[4]: *** [Makefile:405: all-recursive] Error 1 [ 144s] make[4]: Leaving directory '/usr/src/packages/BUILD/firmware/src' [ 144s] make[3]: *** [Makefile:405: all-recursive] Error 1 [ 144s] make[3]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 144s] make[2]: *** [Makefile:635: all-recursive] Error 1 [ 144s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 144s] make[1]: *** [Makefile:554: all] Error 2 [ 144s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 144s] dh_auto_build: error: make -j1 returned exit code 2 [ 144s] make: *** [debian/rules:13: build] Error 25 [ 144s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 144s] ### VM INTERACTION START ### [ 147s] [ 137.241082] sysrq: SysRq : Power Off [ 147s] [ 137.242437] reboot: Power down [ 147s] ### VM INTERACTION END ### [ 147s] [ 147s] build75 failed "build libusrp_3.4.4.7.50ce.dsc" at Fri Jun 5 16:56:47 UTC 2020. [ 147s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Change in libosmocore[master]: gsm0808: fix endieness of call identifier
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/18694 ) Change subject: gsm0808: fix endieness of call identifier .. Patch Set 1: > Patch Set 1: > > I'm not convinced (yet). Normally, we pass values around in host byte order > and only translate them to network byte order when generating messages. > > So why is that value already in netwokr byte order? Why can the caller not > provide it in host byte order? > > Also, if we really want function arguments are not in native (host) byte > order, I think it must clearly be documented in the doxygen part. Hmm. I have checked it multiple times now. Network byte order is big endien, x86er is little endien. However 3GPP TS 48.008, section 3.2.2.105 wants the least significant byte transmitted first. I think thats why the endieness should already match the host byte order here. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/18694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6468e502f552f99ab54aec9d4b1c169fdc0adfb8 Gerrit-Change-Number: 18694 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 05 Jun 2020 16:55:15 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: BTS_Tests: fix f_init_rsl(): expect all 4 transceivers to connect
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18633 ) Change subject: BTS_Tests: fix f_init_rsl(): expect all 4 transceivers to connect .. Patch Set 4: Verified+1 Works for me (C). Tested on my own machine (my usual setup) and in a Docker'ized setup. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18633 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: I32bb6d37929cde420a547e18eeb2f940e833316b Gerrit-Change-Number: 18633 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Jun 2020 16:42:07 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: ttcn3-bts-test/jenkins.sh: stop container with BSC in the end
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/18695 ) Change subject: ttcn3-bts-test/jenkins.sh: stop container with BSC in the end .. ttcn3-bts-test/jenkins.sh: stop container with BSC in the end Otherwise it will be running until killed manually... Change-Id: Ia383febb3ca7ae6263853c68dc7b6d8700612b01 --- M ttcn3-bts-test/jenkins.sh 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/95/18695/1 diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 4974a34..7593143 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -148,6 +148,7 @@ docker container kill ${BUILD_TAG}-trxcon docker container kill ${BUILD_TAG}-fake_trx docker container kill ${BUILD_TAG}-bts +docker container kill ${BUILD_TAG}-bsc network_remove -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/18695 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia383febb3ca7ae6263853c68dc7b6d8700612b01 Gerrit-Change-Number: 18695 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: library/RSL_Emulation: cosmetic: improve logging messages
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18638 ) Change subject: library/RSL_Emulation: cosmetic: improve logging messages .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18638 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: Iefb6bc96e57822e216f8d8480337e6b4afc4d892 Gerrit-Change-Number: 18638 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Jun 2020 16:24:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Build failure of network:osmocom:nightly/open5gs in Debian_10/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_10/armv7l Package network:osmocom:nightly/open5gs failed to build in Debian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 735s] [1929/2112] cc -Isrc/udm/3eca12a@@udm@sta -Isrc/udm -I../src/udm -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/sbi -I../lib/sbi -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/arm-linux-gnueabihf -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/udm/3eca12a@@udm@sta/timer.c.o' -MF 'src/udm/3eca12a@@udm@sta/timer.c.o.d' -o 'src/udm/3eca12a@@udm@sta/timer.c.o' -c ../src/udm/timer.c [ 735s] [1930/2112] cc -Isrc/udr/e340f29@@udr@sta -Isrc/udr -I../src/udr -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/dbi -I../lib/dbi -Ilib/crypt -I../lib/crypt -Ilib/sbi -I../lib/sbi -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/libmongoc-1.0 -I/usr/include/libbson-1.0 -I/usr/include/p11-kit-1 -I/usr/include/arm-linux-gnueabihf -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/udr/e340f29@@udr@sta/init.c.o' -MF 'src/udr/e340f29@@udr@sta/init.c.o.d' -o 'src/udr/e340f29@@udr@sta/init.c.o' -c ../src/udr/init.c [ 735s] [1931/2112] cc -Isrc/udr/e340f29@@open5gs-udrd@exe -Isrc/udr -I../src/udr -Isrc -I../src -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/dbi -I../lib/dbi -Ilib/crypt -I../lib/crypt -Ilib/sbi -I../lib/sbi -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/libmongoc-1.0 -I/usr/include/libbson-1.0 -I/usr/include/p11-kit-1 -I/usr/include/arm-linux-gnueabihf -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -pthread '-DDEFAULT_CONFIG_FILENAME="/etc/open5gs/udr.yaml"' -MD -MQ 'src/udr/e340f29@@open5gs-udrd@exe/app.c.o' -MF 'src/udr/e340f29@@open5gs-udrd@exe/app.c.o.d' -o 'src/udr/e340f29@@open5gs-udrd@exe/app.c.o' -c ../src/udr/app.c [ 735s] [1932/2112] cc -Isrc/udr/e340f29@@udr@sta -Isrc/udr -I../src/udr -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/dbi
Change in libosmocore[master]: gsm0808: fix endieness of call identifier
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/18694 ) Change subject: gsm0808: fix endieness of call identifier .. Patch Set 1: I'm not convinced (yet). Normally, we pass values around in host byte order and only translate them to network byte order when generating messages. So why is that value already in netwokr byte order? Why can the caller not provide it in host byte order? Also, if we really want function arguments are not in native (host) byte order, I think it must clearly be documented in the doxygen part. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/18694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6468e502f552f99ab54aec9d4b1c169fdc0adfb8 Gerrit-Change-Number: 18694 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 05 Jun 2020 16:24:05 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in docker-playground[master]: debian-stretch-titan: do not install unneeded dependencies
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/18693 ) Change subject: debian-stretch-titan: do not install unneeded dependencies .. debian-stretch-titan: do not install unneeded dependencies By default, Debian's package manager (apt) would install as many dependencies as possible, including optional (recommended and suggested) ones. Package 'eclipse-titan' recommends 'default-jdk', which is absolutely not needed for osmo-ttcn3-hacks, and in its turn depends on +100500 more packages like xorg, wayland, etc. This change significantly reduces total amount of dependencies and the overall build time by disabling installation of recommended and suggested dependencies. Change-Id: I56f0d0f37e212b15e8c19ddea96d1c999177eb17 --- M debian-stretch-titan/Dockerfile 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved fixeria: Verified diff --git a/debian-stretch-titan/Dockerfile b/debian-stretch-titan/Dockerfile index 0778db6..15e4492 100644 --- a/debian-stretch-titan/Dockerfile +++ b/debian-stretch-titan/Dockerfile @@ -14,8 +14,9 @@ echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list ADD$OSMOCOM_REPO/Release /tmp/Release -RUNapt-get update && apt-get install -y \ - eclipse-titan +RUNapt-get update && \ + apt-get install -y --no-install-recommends --no-install-suggests \ + eclipse-titan RUNapt-get update && \ apt-get upgrade -y && \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/18693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I56f0d0f37e212b15e8c19ddea96d1c999177eb17 Gerrit-Change-Number: 18693 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in docker-playground[master]: debian-stretch-titan: do not install unneeded dependencies
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/18693 ) Change subject: debian-stretch-titan: do not install unneeded dependencies .. Patch Set 1: Verified+1 Tested, works for me. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/18693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I56f0d0f37e212b15e8c19ddea96d1c999177eb17 Gerrit-Change-Number: 18693 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Jun 2020 16:23:21 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-msc[master]: msc_a: add callref as call id to ASSIGNMENT REQ.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/18692 ) Change subject: msc_a: add callref as call id to ASSIGNMENT REQ. .. Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/osmo-msc/+/18692/1/src/libmsc/msc_a.c File src/libmsc/msc_a.c: https://gerrit.osmocom.org/c/osmo-msc/+/18692/1/src/libmsc/msc_a.c@544 PS1, Line 544: call_id_present = true, : .call_id = cc_trans->callref you are adding it unconditionally here. If we only support AoIP, we can do this unconditionally. Should we still support SCCPlite (I know we do in the BSC, but do we in the MSC?), we would have to add call_id only in AoIP situations. https://gerrit.osmocom.org/c/osmo-msc/+/18692/1/src/libmsc/ran_msg_a.c File src/libmsc/ran_msg_a.c: https://gerrit.osmocom.org/c/osmo-msc/+/18692/1/src/libmsc/ran_msg_a.c@1000 PS1, Line 1000: if(ac->call_id_present) if if was a function... (sorry) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/18692 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I4288f47e4a6d61ec672f431723f6e72c7c6b0799 Gerrit-Change-Number: 18692 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 05 Jun 2020 16:21:45 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmocore[master]: gsm0808: fix endieness of call identifier
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/18694 ) Change subject: gsm0808: fix endieness of call identifier .. Patch Set 1: Is the integer expected to be sent in network byte order or host byte order? If network byte order is expected, I would expect the function to receive a host-byte-order integer and hence htonl() is needed. Which means the bug is probably somewhere else? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/18694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6468e502f552f99ab54aec9d4b1c169fdc0adfb8 Gerrit-Change-Number: 18694 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 05 Jun 2020 16:19:54 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-msc[master]: msc_a: add callref as call id to ASSIGNMENT REQ.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/18692 ) Change subject: msc_a: add callref as call id to ASSIGNMENT REQ. .. Patch Set 1: I would prefer to merge the addition of this IE to all relevant messages (I wrote it in the osmcoom issue), but if you prefer we can also do one commit per command - but let's make sure we don't forget about other messages besides ASSIGNMENT CMD -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/18692 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I4288f47e4a6d61ec672f431723f6e72c7c6b0799 Gerrit-Change-Number: 18692 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 05 Jun 2020 16:18:51 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmocore[master]: gsm0808: fix endieness of call identifier
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/18694 ) Change subject: gsm0808: fix endieness of call identifier .. gsm0808: fix endieness of call identifier The call identifier in the ASSIGNMENT COMMAND is encoded in the wrong endieness. Lets not swap the byte order since the endieness matches already. Change-Id: I6468e502f552f99ab54aec9d4b1c169fdc0adfb8 Related: OS#4582 --- M src/gsm/gsm0808.c 1 file changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/94/18694/1 diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index 23468c3..4c6aca9 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -480,7 +480,6 @@ /* See also: 3GPP TS 48.008 3.2.1.1 ASSIGNMENT REQUEST */ struct msgb *msg; uint16_t cic_sw; - uint32_t ci_sw; /* Mandatory emelent! */ OSMO_ASSERT(ct); @@ -515,9 +514,8 @@ /* AoIP: Call Identifier 3.2.2.105 */ if (ci) { - ci_sw = osmo_htonl(*ci); - msgb_tv_fixed_put(msg, GSM0808_IE_CALL_ID, sizeof(ci_sw), - (uint8_t *) & ci_sw); + msgb_tv_fixed_put(msg, GSM0808_IE_CALL_ID, sizeof(*ci), + (uint8_t *) ci); } if (kc) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/18694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6468e502f552f99ab54aec9d4b1c169fdc0adfb8 Gerrit-Change-Number: 18694 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange
Change in docker-playground[master]: debian-stretch-titan: do not install unneeded dependencies
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/18693 ) Change subject: debian-stretch-titan: do not install unneeded dependencies .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/18693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I56f0d0f37e212b15e8c19ddea96d1c999177eb17 Gerrit-Change-Number: 18693 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Jun 2020 16:17:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-msc[master]: msc_a: add callref as call id to ASSIGNMENT REQ.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/18692 ) Change subject: msc_a: add callref as call id to ASSIGNMENT REQ. .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/18692 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I4288f47e4a6d61ec672f431723f6e72c7c6b0799 Gerrit-Change-Number: 18692 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Jun 2020 15:29:41 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: debian-stretch-titan: do not install unneeded dependencies
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/18693 ) Change subject: debian-stretch-titan: do not install unneeded dependencies .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/18693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I56f0d0f37e212b15e8c19ddea96d1c999177eb17 Gerrit-Change-Number: 18693 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Jun 2020 15:27:02 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: debian-stretch-titan: do not install unneeded dependencies
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/18693 ) Change subject: debian-stretch-titan: do not install unneeded dependencies .. debian-stretch-titan: do not install unneeded dependencies By default, Debian's package manager (apt) would install as many dependencies as possible, including optional (recommended and suggested) ones. Package 'eclipse-titan' recommends 'default-jdk', which is absolutely not needed for osmo-ttcn3-hacks, and in its turn depends on +100500 more packages like xorg, wayland, etc. This change significantly reduces total amount of dependencies and the overall build time by disabling installation of recommended and suggested dependencies. Change-Id: I56f0d0f37e212b15e8c19ddea96d1c999177eb17 --- M debian-stretch-titan/Dockerfile 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/93/18693/1 diff --git a/debian-stretch-titan/Dockerfile b/debian-stretch-titan/Dockerfile index 0778db6..15e4492 100644 --- a/debian-stretch-titan/Dockerfile +++ b/debian-stretch-titan/Dockerfile @@ -14,8 +14,9 @@ echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list ADD$OSMOCOM_REPO/Release /tmp/Release -RUNapt-get update && apt-get install -y \ - eclipse-titan +RUNapt-get update && \ + apt-get install -y --no-install-recommends --no-install-suggests \ + eclipse-titan RUNapt-get update && \ apt-get upgrade -y && \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/18693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I56f0d0f37e212b15e8c19ddea96d1c999177eb17 Gerrit-Change-Number: 18693 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
Change in osmo-msc[master]: msc_a: add callref as call id to ASSIGNMENT REQ.
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/18692 ) Change subject: msc_a: add callref as call id to ASSIGNMENT REQ. .. msc_a: add callref as call id to ASSIGNMENT REQ. The BSSMAP message ASSIGNMENT REQUEST may contain an optional CALL IDENTIFIER IE. While this IE is optional some BSC implementions may require it. Change-Id: I4288f47e4a6d61ec672f431723f6e72c7c6b0799 Related: OS#4582 --- M include/osmocom/msc/ran_msg.h M src/libmsc/msc_a.c M src/libmsc/ran_msg_a.c 3 files changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/92/18692/1 diff --git a/include/osmocom/msc/ran_msg.h b/include/osmocom/msc/ran_msg.h index 1b0e2e8..3b08b46 100644 --- a/include/osmocom/msc/ran_msg.h +++ b/include/osmocom/msc/ran_msg.h @@ -86,6 +86,8 @@ enum nsap_addr_enc rab_assign_addr_enc; bool osmux_present; uint8_t osmux_cid; + bool call_id_present; + uint32_t call_id; }; struct ran_cipher_mode_command { diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c index bc5b7ea..85c92d0 100644 --- a/src/libmsc/msc_a.c +++ b/src/libmsc/msc_a.c @@ -541,6 +541,8 @@ .channel_type = _type, .osmux_present = msc_a->cc.call_leg->rtp[RTP_TO_RAN]->use_osmux, .osmux_cid = msc_a->cc.call_leg->rtp[RTP_TO_RAN]->local_osmux_cid, + .call_id_present = true, + .call_id = cc_trans->callref }, }; if (msc_a_ran_down(msc_a, MSC_ROLE_I, )) { diff --git a/src/libmsc/ran_msg_a.c b/src/libmsc/ran_msg_a.c index cb228ef..2859069 100644 --- a/src/libmsc/ran_msg_a.c +++ b/src/libmsc/ran_msg_a.c @@ -956,6 +956,7 @@ struct sockaddr_storage rtp_addr; struct sockaddr_storage *use_rtp_addr = NULL; struct msgb *msg; + const uint32_t *call_id = NULL; int rc; if (!ac->channel_type) { @@ -996,7 +997,10 @@ } } - msg = gsm0808_create_ass(ac->channel_type, NULL, use_rtp_addr, use_scl, NULL); + if(ac->call_id_present) + call_id = >call_id; + + msg = gsm0808_create_ass(ac->channel_type, NULL, use_rtp_addr, use_scl, call_id); if (ac->osmux_present) _gsm0808_assignment_extend_osmux(msg, ac->osmux_cid); return msg; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/18692 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I4288f47e4a6d61ec672f431723f6e72c7c6b0799 Gerrit-Change-Number: 18692 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange
Build failure of network:osmocom:nightly/libusrp in Debian_Unstable/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/Debian_Unstable/x86_64 Package network:osmocom:nightly/libusrp failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 226s] touch libfx2.lib [ 226s] for obj in delay.rel fx2utils.rel i2c.rel isr.rel timer.rel usb_common.rel; do basename $obj .rel >> libfx2.lib ; done [ 226s] make[4]: Leaving directory '/usr/src/packages/BUILD/firmware/lib' [ 226s] Making all in src [ 226s] make[4]: Entering directory '/usr/src/packages/BUILD/firmware/src' [ 226s] Making all in common [ 226s] make[5]: Entering directory '/usr/src/packages/BUILD/firmware/src/common' [ 226s] srcdir=. ./edit-gpif ./gpif.c usrp_gpif.c usrp_gpif_inline.h [ 226s] /usr/bin/env: 'python': No such file or directory [ 226s] make[5]: *** [Makefile:523: usrp_gpif.c] Error 127 [ 226s] make[5]: Leaving directory '/usr/src/packages/BUILD/firmware/src/common' [ 226s] make[4]: *** [Makefile:405: all-recursive] Error 1 [ 226s] make[4]: Leaving directory '/usr/src/packages/BUILD/firmware/src' [ 226s] make[3]: *** [Makefile:405: all-recursive] Error 1 [ 226s] make[3]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 226s] make[2]: *** [Makefile:635: all-recursive] Error 1 [ 226s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 226s] make[1]: *** [Makefile:554: all] Error 2 [ 226s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 226s] dh_auto_build: error: make -j1 returned exit code 2 [ 226s] make: *** [debian/rules:13: build] Error 25 [ 226s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 226s] ### VM INTERACTION START ### [ 229s] [ 213.726648] sysrq: SysRq : Power Off [ 229s] [ 213.734931] reboot: Power down [ 229s] ### VM INTERACTION END ### [ 229s] [ 229s] goat07 failed "build libusrp_3.4.4.7.50ce.dsc" at Fri Jun 5 14:38:32 UTC 2020. [ 229s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:latest/libusrp in Debian_Unstable/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libusrp/Debian_Unstable/x86_64 Package network:osmocom:latest/libusrp failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libusrp Last lines of build log: [ 235s] touch libfx2.lib [ 235s] for obj in delay.rel fx2utils.rel i2c.rel isr.rel timer.rel usb_common.rel; do basename $obj .rel >> libfx2.lib ; done [ 235s] make[4]: Leaving directory '/usr/src/packages/BUILD/firmware/lib' [ 235s] Making all in src [ 235s] make[4]: Entering directory '/usr/src/packages/BUILD/firmware/src' [ 235s] Making all in common [ 235s] make[5]: Entering directory '/usr/src/packages/BUILD/firmware/src/common' [ 235s] srcdir=. ./edit-gpif ./gpif.c usrp_gpif.c usrp_gpif_inline.h [ 235s] /usr/bin/env: 'python': No such file or directory [ 235s] make[5]: *** [Makefile:523: usrp_gpif.c] Error 127 [ 235s] make[5]: Leaving directory '/usr/src/packages/BUILD/firmware/src/common' [ 235s] make[4]: *** [Makefile:405: all-recursive] Error 1 [ 235s] make[4]: Leaving directory '/usr/src/packages/BUILD/firmware/src' [ 235s] make[3]: *** [Makefile:405: all-recursive] Error 1 [ 235s] make[3]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 235s] make[2]: *** [Makefile:626: all-recursive] Error 1 [ 235s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 235s] make[1]: *** [Makefile:547: all] Error 2 [ 235s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 235s] dh_auto_build: error: make -j1 returned exit code 2 [ 235s] make: *** [debian/rules:13: build] Error 25 [ 235s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 235s] ### VM INTERACTION START ### [ 239s] [ 224.311807] sysrq: SysRq : Power Off [ 239s] [ 224.317911] reboot: Power down [ 239s] ### VM INTERACTION END ### [ 239s] [ 239s] lamb19 failed "build libusrp_3.4.4.dsc" at Fri Jun 5 14:25:06 UTC 2020. [ 239s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Change in osmo-bts[master]: bts-trx: phy_link: Improve logging fmt in phy_link_state_set()
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/18646 to look at the new patch set (#2). Change subject: bts-trx: phy_link: Improve logging fmt in phy_link_state_set() .. bts-trx: phy_link: Improve logging fmt in phy_link_state_set() Change-Id: I4633dd81d0b4cc104ca9e0803993ba766cb23790 --- M include/osmo-bts/phy_link.h M src/common/phy_link.c 2 files changed, 16 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/46/18646/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18646 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4633dd81d0b4cc104ca9e0803993ba766cb23790 Gerrit-Change-Number: 18646 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: gsm_data_shared: drop unused rach_b_thresh & rach_ldavg_slots
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18687 ) Change subject: gsm_data_shared: drop unused rach_b_thresh & rach_ldavg_slots .. gsm_data_shared: drop unused rach_b_thresh & rach_ldavg_slots Change-Id: I75ffc5c0c1f683adf0632bfe71ac51d1adfd97bd --- M include/osmo-bts/gsm_data_shared.h M src/common/gsm_data_shared.c 2 files changed, 0 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h index 75a4515..bcc818a 100644 --- a/include/osmo-bts/gsm_data_shared.h +++ b/include/osmo-bts/gsm_data_shared.h @@ -598,10 +598,6 @@ uint8_t rac; } gprs; - /* RACH NM values */ - int rach_b_thresh; - int rach_ldavg_slots; - /* transceivers */ int num_trx; struct llist_head trx_list; diff --git a/src/common/gsm_data_shared.c b/src/common/gsm_data_shared.c index dc27e4f..dcf40d1 100644 --- a/src/common/gsm_data_shared.c +++ b/src/common/gsm_data_shared.c @@ -322,8 +322,6 @@ } bts->c0->ts[0].pchan = GSM_PCHAN_CCCH_SDCCH4; - bts->rach_b_thresh = -1; - bts->rach_ldavg_slots = -1; bts->features.data = >_features_data[0]; bts->features.data_len = sizeof(bts->_features_data); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I75ffc5c0c1f683adf0632bfe71ac51d1adfd97bd Gerrit-Change-Number: 18687 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-bts[master]: gsm_data_shared: drop forward declaration of struct vty
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18682 ) Change subject: gsm_data_shared: drop forward declaration of struct vty .. gsm_data_shared: drop forward declaration of struct vty Change-Id: I12b178d73e19761d16a6ef8e2a16243a23e1bf04 --- M include/osmo-bts/gsm_data_shared.h 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h index d830758..55c4f04 100644 --- a/include/osmo-bts/gsm_data_shared.h +++ b/include/osmo-bts/gsm_data_shared.h @@ -405,8 +405,6 @@ TRX_PHY_VERSION, }; -struct vty; - /* N. B: always add new features to the end of the list (right before _NUM_BTS_FEAT) to avoid breaking compatibility with BTS compiled against earlier version of this header. Also make sure that the description strings gsm_bts_features_descs[] in gsm_data_shared.c are also updated accordingly! */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I12b178d73e19761d16a6ef8e2a16243a23e1bf04 Gerrit-Change-Number: 18682 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-bts[master]: gsm_data_shared: drop force_combined_si & bcch_change_mark
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18688 ) Change subject: gsm_data_shared: drop force_combined_si & bcch_change_mark .. gsm_data_shared: drop force_combined_si & bcch_change_mark Change-Id: I997ab5e9801af50708ce6dc35004da5e11cb926b --- M include/osmo-bts/gsm_data_shared.h M src/common/gsm_data_shared.c 2 files changed, 0 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h index bcc818a..65e8bfa 100644 --- a/include/osmo-bts/gsm_data_shared.h +++ b/include/osmo-bts/gsm_data_shared.h @@ -602,10 +602,6 @@ int num_trx; struct llist_head trx_list; - /* SI related items */ - int force_combined_si; - int bcch_change_mark; - struct rate_ctr_group *ctrs; bool supp_meas_toa256; diff --git a/src/common/gsm_data_shared.c b/src/common/gsm_data_shared.c index dcf40d1..c05f59d 100644 --- a/src/common/gsm_data_shared.c +++ b/src/common/gsm_data_shared.c @@ -325,9 +325,6 @@ bts->features.data = >_features_data[0]; bts->features.data_len = sizeof(bts->_features_data); - /* si handling */ - bts->bcch_change_mark = 1; - return bts; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18688 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I997ab5e9801af50708ce6dc35004da5e11cb926b Gerrit-Change-Number: 18688 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-bts[master]: gsm_data_shared: drop unused dtxu from struct gsm_bts
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18685 ) Change subject: gsm_data_shared: drop unused dtxu from struct gsm_bts .. gsm_data_shared: drop unused dtxu from struct gsm_bts Change-Id: Ic2ddbf04bac7ced900a4e5e532206652dae64059 --- M include/osmo-bts/gsm_data_shared.h 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h index 12f1bd1..9e45dad 100644 --- a/include/osmo-bts/gsm_data_shared.h +++ b/include/osmo-bts/gsm_data_shared.h @@ -547,7 +547,6 @@ uint8_t bts_nr; /* DTX features of this BTS */ - enum gsm48_dtx_mode dtxu; bool dtxd; /* CCCH is on C0 */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18685 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic2ddbf04bac7ced900a4e5e532206652dae64059 Gerrit-Change-Number: 18685 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-bts[master]: gsm_data_shared: drop unused *nmh from struct gsm_bts
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18684 ) Change subject: gsm_data_shared: drop unused *nmh from struct gsm_bts .. gsm_data_shared: drop unused *nmh from struct gsm_bts Change-Id: I57e9146cfc3274847b50caa44b09b5f06f0cf00b --- M include/osmo-bts/gsm_data_shared.h 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h index 55c4f04..12f1bd1 100644 --- a/include/osmo-bts/gsm_data_shared.h +++ b/include/osmo-bts/gsm_data_shared.h @@ -541,8 +541,6 @@ struct timespec oml_conn_established_timestamp; /* Abis network management O handle */ - struct abis_nm_h *nmh; - struct gsm_abis_mo mo; /* number of this BTS on given E1 link */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I57e9146cfc3274847b50caa44b09b5f06f0cf00b Gerrit-Change-Number: 18684 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-bts[master]: scheduler: drop non-existing extern declarations
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18689 ) Change subject: scheduler: drop non-existing extern declarations .. scheduler: drop non-existing extern declarations Change-Id: Ifa6fc5947e8fb7ec071a6567c275f5db5ab385f9 --- M include/osmo-bts/scheduler.h 1 file changed, 0 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h index c026411..7a9da8f 100644 --- a/include/osmo-bts/scheduler.h +++ b/include/osmo-bts/scheduler.h @@ -148,13 +148,6 @@ struct l1sched_ts *l1sched_trx_get_ts(struct l1sched_trx *l1t, uint8_t tn); -/*! \brief how many frame numbers in advance we should send bursts to PHY */ -extern uint32_t trx_clock_advance; -/*! \brief advance RTS.ind to L2 by that many clocks */ -extern uint32_t trx_rts_advance; -/*! \brief last frame number as received from PHY */ -extern uint32_t transceiver_last_fn; - /*! \brief Initialize the scheduler data structures */ int trx_sched_init(struct l1sched_trx *l1t, struct gsm_bts_trx *trx); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18689 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifa6fc5947e8fb7ec071a6567c275f5db5ab385f9 Gerrit-Change-Number: 18689 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-bts[master]: gsm_data_shared: drop unused ctrl_ack_type_use_block & net_ctrl_ord
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18686 ) Change subject: gsm_data_shared: drop unused ctrl_ack_type_use_block & net_ctrl_ord .. gsm_data_shared: drop unused ctrl_ack_type_use_block & net_ctrl_ord Change-Id: I7c8ddc4a9cfbbd1983e89fa261eaf4f32e15c6bd --- M include/osmo-bts/gsm_data_shared.h 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h index 9e45dad..75a4515 100644 --- a/include/osmo-bts/gsm_data_shared.h +++ b/include/osmo-bts/gsm_data_shared.h @@ -596,8 +596,6 @@ } cell; struct gsm_bts_gprs_nsvc nsvc[2]; uint8_t rac; - uint8_t net_ctrl_ord; - bool ctrl_ack_type_use_block; } gprs; /* RACH NM values */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7c8ddc4a9cfbbd1983e89fa261eaf4f32e15c6bd Gerrit-Change-Number: 18686 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-bts[master]: vty: fix bts_dump_vty(): properly print OML stream ID (TEI)
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18683 ) Change subject: vty: fix bts_dump_vty(): properly print OML stream ID (TEI) .. vty: fix bts_dump_vty(): properly print OML stream ID (TEI) Change-Id: I80ceba60e4b48d5bc68de71a2b2a2036b1e78f57 --- M include/osmo-bts/gsm_data_shared.h M src/common/vty.c 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h index 65e8bfa..f010dbc 100644 --- a/include/osmo-bts/gsm_data_shared.h +++ b/include/osmo-bts/gsm_data_shared.h @@ -536,7 +536,6 @@ int ms_max_power; /* how do we talk OML with this TRX? */ - uint8_t oml_tei; struct e1inp_sign_link *oml_link; struct timespec oml_conn_established_timestamp; diff --git a/src/common/vty.c b/src/common/vty.c index a57f3b5..1d74b36 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -856,7 +856,8 @@ bts->description ? bts->description : "(null)", VTY_NEWLINE); vty_out(vty, " Unit ID: %u/%u/0, OML Stream ID 0x%02x%s", bts->ip_access.site_id, bts->ip_access.bts_id, - bts->oml_tei, VTY_NEWLINE); + bts->oml_link ? bts->oml_link->tei : 0x00, + VTY_NEWLINE); vty_out(vty, " NM State: "); net_dump_nmstate(vty, >mo.nm_state); vty_out(vty, " Site Mgr NM State: "); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I80ceba60e4b48d5bc68de71a2b2a2036b1e78f57 Gerrit-Change-Number: 18683 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: report: Add trial commit info to junit file
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18691 ) Change subject: report: Add trial commit info to junit file .. report: Add trial commit info to junit file Change-Id: I997bbbeb3807af5cd927594a4155b824f0c6d03d --- M src/osmo_gsm_tester/core/report.py M src/osmo_gsm_tester/core/trial.py 2 files changed, 27 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_gsm_tester/core/report.py b/src/osmo_gsm_tester/core/report.py index 121fbaf..5014bf5 100644 --- a/src/osmo_gsm_tester/core/report.py +++ b/src/osmo_gsm_tester/core/report.py @@ -46,6 +46,14 @@ replacement_char = '\uFFFD' # Unicode replacement character return invalid_xml_char_ranges_regex.sub(replacement_char, escape(str)) +def hash_info_to_junit(testsuite, hash_info): +properties = et.SubElement(testsuite, 'properties') +for key, val in hash_info.items(): +prop = et.SubElement(properties, 'property') +prop.set('name', 'ref:' + key) +prop.set('value', val) + + def trial_to_junit_write(trial, junit_path): elements = et.ElementTree(element=trial_to_junit(trial)) elements.write(junit_path) @@ -57,8 +65,10 @@ num_errors = 0 time = 0 id = 0 +hash_info = trial.get_all_inst_hash_info() for suite in trial.suites: testsuite = suite_to_junit(suite) +hash_info_to_junit(testsuite, hash_info) testsuite.set('id', str(id)) id += 1 testsuites.append(testsuite) diff --git a/src/osmo_gsm_tester/core/trial.py b/src/osmo_gsm_tester/core/trial.py index eaf18c3..001421f 100644 --- a/src/osmo_gsm_tester/core/trial.py +++ b/src/osmo_gsm_tester/core/trial.py @@ -21,6 +21,7 @@ import time import shutil import tarfile +import pathlib from . import log from . import util @@ -212,6 +213,22 @@ self.log('Storing JUnit report in', junit_path) report.trial_to_junit_write(self, junit_path) +def get_all_inst_hash_info(self): +d = {} +pathlist = pathlib.Path(str(self.inst_dir)).glob('**/*git_hashes.txt') +for path in pathlist: +# because path is object not string +abs_path_str = str(path) # because path is object not string +dir, file = os.path.split(abs_path_str) +reldir = os.path.relpath(dir, str(self.inst_dir)).rstrip(os.sep) +with open(abs_path_str, 'r') as f: +for line in [l.strip() for l in f.readlines()]: +if not line: +continue +hash, proj = tuple(line.split(' ', 1)) +d[os.path.join(reldir,proj)] = hash +return d + def log_report(self): log.large_separator(self.name(), self.status) self.log(report.trial_to_text(self)) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18691 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: I997bbbeb3807af5cd927594a4155b824f0c6d03d Gerrit-Change-Number: 18691 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: report: Add trial commit info to junit file
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18691 ) Change subject: report: Add trial commit info to junit file .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18691 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: I997bbbeb3807af5cd927594a4155b824f0c6d03d Gerrit-Change-Number: 18691 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Jun 2020 12:47:56 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: rsl: refactor handling of RSL_IE_MR_CONFIG
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18680 ) Change subject: rsl: refactor handling of RSL_IE_MR_CONFIG .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibfd5845ea429945b352dd14421e86562998d65ca Gerrit-Change-Number: 18680 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Jun 2020 12:47:15 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: rsl: refactor handling of RSL_IE_MR_CONFIG
Hello pespin, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/18680 to look at the new patch set (#2). Change subject: rsl: refactor handling of RSL_IE_MR_CONFIG .. rsl: refactor handling of RSL_IE_MR_CONFIG - get rid of gsm_lchan::mr_bts_lv, it's never used anyway, - check IE length in amr_parse_mr_conf() before parsing, - check return code of amr_parse_mr_conf(). Change-Id: Ibfd5845ea429945b352dd14421e86562998d65ca --- M include/osmo-bts/gsm_data_shared.h M src/common/amr.c M src/common/rsl.c 3 files changed, 20 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/80/18680/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibfd5845ea429945b352dd14421e86562998d65ca Gerrit-Change-Number: 18680 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-gsm-tester[master]: report: Add trial commit info to junit file
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18691 ) Change subject: report: Add trial commit info to junit file .. report: Add trial commit info to junit file Change-Id: I997bbbeb3807af5cd927594a4155b824f0c6d03d --- M src/osmo_gsm_tester/core/report.py M src/osmo_gsm_tester/core/trial.py 2 files changed, 27 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/91/18691/1 diff --git a/src/osmo_gsm_tester/core/report.py b/src/osmo_gsm_tester/core/report.py index 121fbaf..5014bf5 100644 --- a/src/osmo_gsm_tester/core/report.py +++ b/src/osmo_gsm_tester/core/report.py @@ -46,6 +46,14 @@ replacement_char = '\uFFFD' # Unicode replacement character return invalid_xml_char_ranges_regex.sub(replacement_char, escape(str)) +def hash_info_to_junit(testsuite, hash_info): +properties = et.SubElement(testsuite, 'properties') +for key, val in hash_info.items(): +prop = et.SubElement(properties, 'property') +prop.set('name', 'ref:' + key) +prop.set('value', val) + + def trial_to_junit_write(trial, junit_path): elements = et.ElementTree(element=trial_to_junit(trial)) elements.write(junit_path) @@ -57,8 +65,10 @@ num_errors = 0 time = 0 id = 0 +hash_info = trial.get_all_inst_hash_info() for suite in trial.suites: testsuite = suite_to_junit(suite) +hash_info_to_junit(testsuite, hash_info) testsuite.set('id', str(id)) id += 1 testsuites.append(testsuite) diff --git a/src/osmo_gsm_tester/core/trial.py b/src/osmo_gsm_tester/core/trial.py index eaf18c3..001421f 100644 --- a/src/osmo_gsm_tester/core/trial.py +++ b/src/osmo_gsm_tester/core/trial.py @@ -21,6 +21,7 @@ import time import shutil import tarfile +import pathlib from . import log from . import util @@ -212,6 +213,22 @@ self.log('Storing JUnit report in', junit_path) report.trial_to_junit_write(self, junit_path) +def get_all_inst_hash_info(self): +d = {} +pathlist = pathlib.Path(str(self.inst_dir)).glob('**/*git_hashes.txt') +for path in pathlist: +# because path is object not string +abs_path_str = str(path) # because path is object not string +dir, file = os.path.split(abs_path_str) +reldir = os.path.relpath(dir, str(self.inst_dir)).rstrip(os.sep) +with open(abs_path_str, 'r') as f: +for line in [l.strip() for l in f.readlines()]: +if not line: +continue +hash, proj = tuple(line.split(' ', 1)) +d[os.path.join(reldir,proj)] = hash +return d + def log_report(self): log.large_separator(self.name(), self.status) self.log(report.trial_to_text(self)) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18691 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: I997bbbeb3807af5cd927594a4155b824f0c6d03d Gerrit-Change-Number: 18691 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in osmo-bts[master]: rsl: refactor handling of RSL_IE_MR_CONFIG
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18680 ) Change subject: rsl: refactor handling of RSL_IE_MR_CONFIG .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/18680/1/src/common/amr.c File src/common/amr.c: https://gerrit.osmocom.org/c/osmo-bts/+/18680/1/src/common/amr.c@135 PS1, Line 135: amr_mrc->bts_mode[2].threshold = > So if len = 4, we still reach here, and access offset 5. […] I see the point now, thanks! I also just noticed that this functions already has some length checks (see lines 101 .. 111), so we only need to make sure that at least two bytes present. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibfd5845ea429945b352dd14421e86562998d65ca Gerrit-Change-Number: 18680 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Jun 2020 11:37:58 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
Change in osmo-bts[master]: rsl: refactor handling of RSL_IE_MR_CONFIG
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18680 ) Change subject: rsl: refactor handling of RSL_IE_MR_CONFIG .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/18680/1/src/common/amr.c File src/common/amr.c: https://gerrit.osmocom.org/c/osmo-bts/+/18680/1/src/common/amr.c@135 PS1, Line 135: amr_mrc->bts_mode[2].threshold = > See lines 84 .. 88. So if len = 4, we still reach here, and access offset 5. Am I wrong? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibfd5845ea429945b352dd14421e86562998d65ca Gerrit-Change-Number: 18680 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Jun 2020 10:33:41 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: report: Add trial name to junit 'testsuites' node
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18690 ) Change subject: report: Add trial name to junit 'testsuites' node .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18690 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: I8cd62484bb67756e3d98d43a75731f4702acd2b7 Gerrit-Change-Number: 18690 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Jun 2020 10:21:35 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: report: Add trial name to junit 'testsuites' node
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18690 ) Change subject: report: Add trial name to junit 'testsuites' node .. report: Add trial name to junit 'testsuites' node Change-Id: I8cd62484bb67756e3d98d43a75731f4702acd2b7 --- M src/osmo_gsm_tester/core/report.py 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_gsm_tester/core/report.py b/src/osmo_gsm_tester/core/report.py index f781695..121fbaf 100644 --- a/src/osmo_gsm_tester/core/report.py +++ b/src/osmo_gsm_tester/core/report.py @@ -70,6 +70,7 @@ testsuites.set('errors', str(num_errors)) testsuites.set('failures', str(num_failures)) testsuites.set('time', str(math.ceil(time))) +testsuites.set('name', trial.name()) return testsuites def suite_to_junit(suite): -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18690 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: I8cd62484bb67756e3d98d43a75731f4702acd2b7 Gerrit-Change-Number: 18690 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-bts[master]: rsl: refactor handling of RSL_IE_MR_CONFIG
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18680 ) Change subject: rsl: refactor handling of RSL_IE_MR_CONFIG .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/18680/1/src/common/amr.c File src/common/amr.c: https://gerrit.osmocom.org/c/osmo-bts/+/18680/1/src/common/amr.c@135 PS1, Line 135: amr_mrc->bts_mode[2].threshold = > before doing this we should check if "len > 4" See lines 84 .. 88. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibfd5845ea429945b352dd14421e86562998d65ca Gerrit-Change-Number: 18680 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Jun 2020 09:59:43 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: report: Add trial name to junit 'testsuites' node
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18690 ) Change subject: report: Add trial name to junit 'testsuites' node .. report: Add trial name to junit 'testsuites' node Change-Id: I8cd62484bb67756e3d98d43a75731f4702acd2b7 --- M src/osmo_gsm_tester/core/report.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/90/18690/1 diff --git a/src/osmo_gsm_tester/core/report.py b/src/osmo_gsm_tester/core/report.py index f781695..121fbaf 100644 --- a/src/osmo_gsm_tester/core/report.py +++ b/src/osmo_gsm_tester/core/report.py @@ -70,6 +70,7 @@ testsuites.set('errors', str(num_errors)) testsuites.set('failures', str(num_failures)) testsuites.set('time', str(math.ceil(time))) +testsuites.set('name', trial.name()) return testsuites def suite_to_junit(suite): -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18690 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: I8cd62484bb67756e3d98d43a75731f4702acd2b7 Gerrit-Change-Number: 18690 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in osmo-gsm-tester[master]: testenv: Support test overlaying a directory to look for templates
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18662 ) Change subject: testenv: Support test overlaying a directory to look for templates .. testenv: Support test overlaying a directory to look for templates This way tests which require a very specific config file can override specific template files used by object classes. Change-Id: I65d1b1e826d2d430ee83810d998b98d0ccaa07cd --- M selftest/suite_test/suite_test.ok M selftest/suite_test/suite_test.ok.ign M selftest/suite_test/suite_test.py A selftest/suite_test/suitedirB/suiteC/mytemplatedir/.gitignore A selftest/suite_test/suitedirB/suiteC/suite.conf A selftest/suite_test/suitedirB/suiteC/test_template_overlay.py M src/osmo_gsm_tester/core/template.py M src/osmo_gsm_tester/obj/stp_osmo.py M src/osmo_gsm_tester/testenv.py 9 files changed, 181 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/selftest/suite_test/suite_test.ok b/selftest/suite_test/suite_test.ok index fee07d0..a7c6422 100644 --- a/selftest/suite_test/suite_test.ok +++ b/selftest/suite_test/suite_test.ok @@ -619,5 +619,109 @@ skip: test_fail.py skip: test_fail_raise.py pass: test_suite_params.py (N.N sec) +- test with template overlay +cnf suiteC: DBG: reading suite.conf [suite.py:[LINENR]] + +- +trial suiteC +- +tst suiteC: reserving resources in [PATH]/selftest/suite_test/test_work/state_dir ... [suite.py:[LINENR]] +tst suiteC: DBG: {combining='resources'} [suite.py:[LINENR]] +tst {combining_scenarios='resources'}: DBG: {definition_conf={ip_address=[{'addr': '10.42.42.2'}]}} [suiteC↪{combining_scenarios='resources'}] [suite.py:[LINENR]] +tst suiteC: DBG: {combining='modifiers'} [suite.py:[LINENR]] +tst {combining_scenarios='modifiers'}: DBG: {definition_conf={}} [suiteC↪{combining_scenarios='modifiers'}] [suite.py:[LINENR]] +tst suiteC: Reserving 1 x ip_address (candidates: 3) [resource.py:[LINENR]] +tst suiteC: DBG: Picked - _hash: fd103b22c7cf2480d609150e06f4bbd92ac78d8c + addr: 10.42.42.2 + [resource.py:[LINENR]] + +-- +trial suiteC test_template_overlay.py +-- +tst test_template_overlay.py:[LINENR]: - Testing: expect to fail on invalid templates overlay dir [suiteC↪test_template_overlay.py:[LINENR]] [test_template_overlay.py:[LINENR]] +tst test_template_overlay.py:[LINENR]: sucess: setting non-existing templates dir raised RuntimeError [suiteC↪test_template_overlay.py:[LINENR]] [test_template_overlay.py:[LINENR]] +tst test_template_overlay.py:[LINENR]: [suiteC↪test_template_overlay.py:[LINENR]] [test_template_overlay.py:[LINENR]] +--- ReservedResources: DBG: requesting use of ip_address {specifics={}} [resource.py:[LINENR]] +tst suiteC: Using 1 x ip_address (candidates: 1) [resource.py:[LINENR]] +tst suiteC: DBG: Picked - _hash: fd103b22c7cf2480d609150e06f4bbd92ac78d8c + _reserved_by: suiteC-[ID_NUM]-[ID_NUM] + addr: 10.42.42.2 + [resource.py:[LINENR]] +--- ReservedResources: DBG: {available=1} [resource.py:[LINENR]] +--- ReservedResources: DBG: {using={_hash='fd103b22c7cf2480d609150e06f4bbd92ac78d8c', _reserved_by='suiteC-[ID_NUM]-[ID_NUM]', addr='10.42.42.2'}} [resource.py:[LINENR]] +tst test_template_overlay.py:[LINENR]: - Testing: original template [suiteC↪test_template_overlay.py:[LINENR]] [test_template_overlay.py:[LINENR]] +run osmo-stp_10.42.42.2: DBG: {config_file='test_trial_tmp/test_run_6/suiteC/test_template_overlay.py/osmo-stp_10.42.42.2/osmo-stp.cfg'} [suiteC↪test_template_overlay.py:[LINENR]↪test_template_overlay.py↪osmo-stp_10.42.42.2] [stp_osmo.py:[LINENR]] +tst suiteC: DBG: {combining='config'} [suite.py:[LINENR]] +tst {combining_scenarios='config'}: DBG: {definition_conf={}} [suiteC↪{combining_scenarios='config'}] [suite.py:[LINENR]] +run osmo-stp_10.42.42.2: DBG: STP CONFIG: +{'stp': {'ip_address': {'_hash': 'fd103b22c7cf2480d609150e06f4bbd92ac78d8c', +'_reserved_by': 'suiteC-[ID_NUM]-[ID_NUM]', +'_used': True, +'addr': '10.42.42.2'}}} [suiteC↪test_template_overlay.py:[LINENR]↪test_template_overlay.py↪osmo-stp_10.42.42.2] [stp_osmo.py:[LINENR]] +cnf Templates: DBG: rendering osmo-stp.cfg.tmpl [suiteC↪test_template_overlay.py:[LINENR]↪test_template_overlay.py↪Templates] [template.py:[LINENR]] +run osmo-stp_10.42.42.2: DBG: ! Configuration rendered by osmo-gsm-tester +log stderr + logging filter all 1 + logging color 1 + logging print category 1 + logging print extended-timestamp 1 + logging level set-all debug +line vty + no login + bind 10.42.42.2 +!ctrl +! bind 10.42.42.2 +cs7 instance 0 + xua rkm routing-key-allocation
Change in osmo-gsm-tester[master]: testenv: Get rid of 'resources' global variable
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18660 ) Change subject: testenv: Get rid of 'resources' global variable .. testenv: Get rid of 'resources' global variable Change-Id: Id7576d21d0f9de29dd9bc4211eaf9b9ec634c990 --- M selftest/suite_test/suitedirA/test_suite/mo_mt_sms.py M selftest/suite_test/suitedirA/test_suite/mo_sms.py M src/osmo_gsm_tester/testenv.py 3 files changed, 14 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/selftest/suite_test/suitedirA/test_suite/mo_mt_sms.py b/selftest/suite_test/suitedirA/test_suite/mo_mt_sms.py index c9558d8..c3a1dd5 100644 --- a/selftest/suite_test/suitedirA/test_suite/mo_mt_sms.py +++ b/selftest/suite_test/suitedirA/test_suite/mo_mt_sms.py @@ -1,14 +1,14 @@ -ip_address = resources.ip_address() -nitb = resources.nitb() -bts = resources.bts() -ms_mo = resources.modem() -ms_mt = resources.modem() +ip_address = tenv.ip_address() +nitb = tenv.nitb() +bts = tenv.bts() +ms_mo = tenv.modem() +ms_mt = tenv.modem() nitb.start(ip_address) bts.start(nitb) -nitb.add_subscriber(ms_mo, resources.msisdn()) -nitb.add_subscriber(ms_mt, resources.msisdn()) +nitb.add_subscriber(ms_mo, tenv.msisdn()) +nitb.add_subscriber(ms_mt, tenv.msisdn()) ms_mo.start() ms_mt.start() diff --git a/selftest/suite_test/suitedirA/test_suite/mo_sms.py b/selftest/suite_test/suitedirA/test_suite/mo_sms.py index 768a99c..48923d2 100644 --- a/selftest/suite_test/suitedirA/test_suite/mo_sms.py +++ b/selftest/suite_test/suitedirA/test_suite/mo_sms.py @@ -1,9 +1,9 @@ -ip_address = resources.ip_address() -nitb = resources.nitb() -bts = resources.bts() -ms_ext = resources.msisdn() -fake_ext = resources.msisdn() -ms = resources.modem() +ip_address = tenv.ip_address() +nitb = tenv.nitb() +bts = tenv.bts() +ms_ext = tenv.msisdn() +fake_ext = tenv.msisdn() +ms = tenv.modem() nitb.configure(ip_address, bts) bts.configure(nitb) diff --git a/src/osmo_gsm_tester/testenv.py b/src/osmo_gsm_tester/testenv.py index 789e291..f3ac02e 100644 --- a/src/osmo_gsm_tester/testenv.py +++ b/src/osmo_gsm_tester/testenv.py @@ -30,7 +30,6 @@ from .core.event_loop import MainLoop suite = None -resources = None log = None dbg = None err = None @@ -330,10 +329,9 @@ from .core.event_loop import MainLoop from .obj.sms import Sms as Sms_class -global test, resources, log, dbg, err, wait, wait_no_raise, sleep, poll, prompt, Sms, process, tenv +global test, log, dbg, err, wait, wait_no_raise, sleep, poll, prompt, Sms, process, tenv test = _test -resources = suite_run.reserved_resources # TODO: remove this global, only used in selftest log = test.log dbg = test.dbg err = test.err -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18660 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: Id7576d21d0f9de29dd9bc4211eaf9b9ec634c990 Gerrit-Change-Number: 18660 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: doc: manual: Write initial Test API section
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18663 ) Change subject: doc: manual: Write initial Test API section .. doc: manual: Write initial Test API section Change-Id: I86bc9a8a0b5ff50e72c21a4bd8a857830bd84c4c --- M doc/manuals/chapters/test_api.adoc 1 file changed, 105 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/doc/manuals/chapters/test_api.adoc b/doc/manuals/chapters/test_api.adoc index f541231..f159348 100644 --- a/doc/manuals/chapters/test_api.adoc +++ b/doc/manuals/chapters/test_api.adoc @@ -1,4 +1,107 @@ == Test API -*TODO* (in the meantime, look at src/osmo_gsm_tester/test.py, as well as -suite.py, which calls the test's setup() function to get an idea) +All tests run by {app-name} are python script files. On top of usual python +standard features, {app-name} provides a set of public APIs and tools that +these tests can use in order to interact with the core of {app-name}, like +creating object classes, run processes synchronously or asynchronously, wait for +events, retrieve specific configuration, etc. This section aims at documenting +the most relevant tools available for tests. + +First of all, it is important to avoid blocking out of the core's main event loop in +the test, since doing that will prevent {app-name} core functionalities to work +properly, such as control of asynchronous processes. + +To get access to those functionalities, a test must import a test environment +previously prepared by {app-name} before the test was started: +[source,python] + +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + + +After the test environment is imported, aome usual functionalities are available +directly under the global scope. Specially noticeable is the existence of object +_tenv_, which provides access to most of the functionalities. + +The test can simply ask {app-name} to sleep some time, while giving control back +to {app-name} core's mainloop: +[source,python] + +sleep(3) # sleep for 3 seconds + + +One can also wait for events in the background, for instance launch a child +process locally in the same host and wait for its termination: +[source,python] + +proc = process.Process('process_description_name', working_dir_to_store_logs, 'sleep 4') <1> +tenv.remember_to_stop(proc) <2> +proc.launch() <3> +proc.wait() <4> + +<1> Create process object. This line doesn't yet runs it. +<2> Make sure the core will kill the process if this test fails +<3> Start process asynchronously +<4> wait until process is done. One could waiting generically here too: _wait(proc.terminated)_ + +If running asynchronously is not needed, one can run synchronously in an easy +way: +[source,python] + +proc = process.Process('process_description_name', working_dir_to_store_logs, 'sleep 4') +proc.launch_sync() + + +One can also log output using either the regular _print_ function from python, +or using {app-name} specific functions available: +[source,python] + +log('this is a regular log message') +dbg('this is a dbg message, only printed on outputs where dbg is enabled') +err('outputs log message for non-expected events') +print('this is the same as log()') + + +The test also gains access to suite and/or test specific configuration through +different APIs: +[source,python] + +test_config = tenv.config_test_specific() +threshold = int(test_config.get('threshold', 2)) +suite_config = tenv.config_suite_specific() +foobar = suite_config['foobar'] + + +A test requiring a really specific config file for an object class it is going +to run can provide its own template files by overlaying an own directory +containing them on top of the usual default directory where object class +templates are (_osmo-gsm-tester.git/src/osmo_gsm_tester/obj/templates/_): +[source,python] + +tenv.set_overlay_template_dir(os.path.join(os.path.dirname(__file__), 'mytemplatedir')) + + +Several tests in a suite can also share code by using some APIs provided by +{app-names}. The shared python code must be placed in files under the 'lib/' +subdirectory in the suite directory where the test belongs to. +[source,python] + +# File containing function foobar() available under ${suite_dir}/lib/testlib.py: +import testlib +tenv.test_import_modules_register_for_cleanup(testlib) +from testlib import foobar + + +For a complete set of features and how to use them, one can have a look at real +examples present in {app-name} git repository under the _sysmocom/_ directory. +Besides those, have a look too a _testenv.py_ file, which implements the 'tenv' +object available to tests. + +=== Test verdict + +In general, a test reaching the end of the file and returning control to +{app-name} core will be flagged as a successful test (PASS). + +If an exception is thrown from within the test file
Change in osmo-gsm-tester[master]: selftest: template: Test existing overlay dir features
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18661 ) Change subject: selftest: template: Test existing overlay dir features .. selftest: template: Test existing overlay dir features Change-Id: Iff1a4dafcbf2193e95b1fb6e5a6712f1bcdd6309 --- A selftest/template_test/mytemplatedir/mytemplate.cfg.tmpl A selftest/template_test/mytemplatedir/osmo-bsc.cfg.tmpl D selftest/template_test/osmo-nitb.cfg.tmpl M selftest/template_test/template_test.ok M selftest/template_test/template_test.py M src/osmo_gsm_tester/core/template.py 6 files changed, 214 insertions(+), 85 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/selftest/template_test/mytemplatedir/mytemplate.cfg.tmpl b/selftest/template_test/mytemplatedir/mytemplate.cfg.tmpl new file mode 100644 index 000..efafbca --- /dev/null +++ b/selftest/template_test/mytemplatedir/mytemplate.cfg.tmpl @@ -0,0 +1 @@ +test-overlay-works-fine-only-available ${one.two.works} diff --git a/selftest/template_test/mytemplatedir/osmo-bsc.cfg.tmpl b/selftest/template_test/mytemplatedir/osmo-bsc.cfg.tmpl new file mode 100644 index 000..5c9400b --- /dev/null +++ b/selftest/template_test/mytemplatedir/osmo-bsc.cfg.tmpl @@ -0,0 +1 @@ +test-overlay-works-fine ${foo.bar.works} diff --git a/selftest/template_test/osmo-nitb.cfg.tmpl b/selftest/template_test/osmo-nitb.cfg.tmpl deleted file mode 100644 index c0a5c46..000 --- a/selftest/template_test/osmo-nitb.cfg.tmpl +++ /dev/null @@ -1,82 +0,0 @@ -! -! OpenBSC configuration saved from vty -! -password foo -! -log stderr - logging filter all 1 - logging color 0 - logging print category 0 - logging print extended-timestamp 1 - logging level set-all debug -! -line vty - no login - bind ${vty_bind_ip} -! -e1_input - e1_line 0 driver ipa - ipa bind ${abis_bind_ip} -network - network country code ${mcc} - mobile network code ${mnc} - short name ${net_name_short} - long name ${net_name_long} - auth policy ${net_auth_policy} - location updating reject cause 13 - encryption ${encryption} - neci 1 - rrlp mode none - mm info 1 - handover 0 - handover window rxlev averaging 10 - handover window rxqual averaging 1 - handover window rxlev neighbor averaging 10 - handover power budget interval 6 - handover power budget hysteresis 3 - handover maximum distance -smpp - local-tcp-ip ${nitb.ip_address.addr} 2775 - system-id test-nitb - policy ${smsc.policy} - %for esme in esme_list: - esme ${esme.system_id} - % if esme.password == '': - no password - % else: - password ${esme.password} - % endif - default-route - %endfor -ctrl - bind ${ctrl_bind_ip} -%for bts in bts_list: - bts ${loop.index} - type ${bts.type} - band ${bts.band} - cell_identity ${bts.cell_identity} - location_area_code ${bts.location_area_code} - training_sequence_code 7 - base_station_id_code ${bts.base_station_id_code} - ms max power 15 - cell reselection hysteresis 4 - rxlev access min 0 - channel allocator ascending - rach tx integer 9 - rach max transmission 7 - ip.access unit_id ${bts.unit_id} 0 - oml ip.access stream_id ${bts.stream_id} line 0 - gprs mode none -% for trx in bts.trx_list: - trx ${loop.index} - rf_locked 0 - arfcn ${trx.arfcn} - nominal power 23 - max_power_red ${trx.max_power_red} - rsl e1 tei 0 -% for ts in trx.timeslot_list: - timeslot ${loop.index} -phys_chan_config ${ts.phys_chan_config} -% endfor -% endfor -%endfor diff --git a/selftest/template_test/template_test.ok b/selftest/template_test/template_test.ok index 88b77b0..718ef6e 100644 --- a/selftest/template_test/template_test.ok +++ b/selftest/template_test/template_test.ok @@ -191,3 +191,201 @@ - Testing: expect to fail on invalid templates dir sucess: setting non-existing templates dir raised RuntimeError +- Testing: template directory overlay (still can find default one?) +cnf Templates: DBG: rendering osmo-nitb.cfg.tmpl +! Configuration rendered by osmo-gsm-tester +password foo +! +log stderr + logging filter all 1 + logging color 1 + logging print category 1 + logging print extended-timestamp 1 + logging level set-all debug +! +line vty + no login + bind val_ip_address +! +e1_input + e1_line 0 driver ipa + ipa bind val_ip_address +network + network country code val_mcc + mobile network code val_mnc + short name val_short_name + long name val_long_name + auth policy val_auth_policy + location updating reject cause 13 + encryption val_encryption + neci 1 + rrlp mode none + mm info 1 + handover 0 + handover window rxlev averaging 10 + handover window rxqual averaging 1 + handover window rxlev neighbor averaging 10 + handover power budget interval 6 + handover power budget hysteresis 3 + handover maximum distance + bts 0 + type val_type_bts0 + band val_band_bts0 + cell_identity val_bts.cell_identity_bts0 + location_area_code val_bts.location_area_code_bts0 +
Change in osmo-gsm-tester[master]: process: Improve launch_sync() exception due to process failing
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18659 ) Change subject: process: Improve launch_sync() exception due to process failing .. process: Improve launch_sync() exception due to process failing After this commit, in some situations ssh related errors are printed directly in the exception to quickly find cause of the issue. Example: FAIL: ping.py (5.0 sec) Error: rm-remote-dir(pid=25913): launch_sync(): local ssh process exited with status 255 (ssh: connect to host 10.42.42.110 port 22: No route to host) [trial↪4g:srsue-rftype@zmq+srsenb-rftype@zmq+mod-enb-nprb@6↪ping.py:9↪ping.py↪srsepc_10.42.42.118↪host-jenkins@10.42.42.110↪rm-remote-dir(pid=25913)] Change-Id: Ia16c7dec96f70d761600ad6a50d9df8382d9c2c8 --- M src/osmo_gsm_tester/core/process.py 1 file changed, 17 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_gsm_tester/core/process.py b/src/osmo_gsm_tester/core/process.py index 36ed057..33ae69a 100644 --- a/src/osmo_gsm_tester/core/process.py +++ b/src/osmo_gsm_tester/core/process.py @@ -196,7 +196,7 @@ self.terminate() raise e if raise_nonsuccess and self.result != 0: -raise log.Error('Exited in error %d' % self.result) +raise self.RunError('launch_sync()') return self.result def respawn(self): @@ -357,6 +357,11 @@ self.process_obj.stdin.write(cmd.encode("utf-8")) self.process_obj.stdin.flush() +def RunError(self, msg_prefix): +'Get a log.Error filled in with Result information. Use when program is terminated and result !=0' +msg = '%s: local process exited with status %d' % (msg_prefix, self.result) +return log.Error(msg) + class RemoteProcess(Process): def __init__(self, name, run_dir, remote_user, remote_host, remote_cwd, popen_args, remote_env={}, **popen_kwargs): @@ -382,6 +387,17 @@ ' '.join(self.popen_args))] self.dbg(self.popen_args, dir=self.run_dir, conf=self.popen_kwargs, remote_env=self.remote_env) +def RunError(self, msg_prefix): +'Overwrite Process method with ssh extra information' +# man ssh states it returns 255 if an ssh error occurred: +msg = msg_prefix + ': ' +if self.result == 255: +tail = ' (' + (self.get_stderr_tail(tail=1, prefix='') or '').rstrip() + ')' +msg += 'local ssh process exited with status %d%s' % (self.result, tail if 'ssh' in tail else '') +else: +msg += 'remote process exited with status %d' % (self.result) +return log.Error(msg) + class NetNSProcess(Process): NETNS_EXEC_BIN = 'osmo-gsm-tester_netns_exec.sh' def __init__(self, name, run_dir, netns, popen_args, **popen_kwargs): -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18659 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: Ia16c7dec96f70d761600ad6a50d9df8382d9c2c8 Gerrit-Change-Number: 18659 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: log: Improve log ctx information in log.Error exception
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18658 ) Change subject: log: Improve log ctx information in log.Error exception .. log: Improve log ctx information in log.Error exception Before, it would show somethig like: """ osmo_gsm_tester.core.log.Error: Exited in error 255 """ Now: """ osmo_gsm_tester.core.log.Error: rm-remote-dir(pid=24820): Exited in error 255 [trial↪4g:srsue-rftype@zmq+srsenb-rftype@zmq+mod-enb-nprb@6↪ping.py:9↪ping.py↪srsepc_10.42.42.118↪host-jenkins@10.42.42.110↪rm-remote-dir(pid=24820)] """ Change-Id: I8873f67a2f3df21c4dd552c92510535bf95e2c9d --- M src/osmo_gsm_tester/core/log.py 1 file changed, 11 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_gsm_tester/core/log.py b/src/osmo_gsm_tester/core/log.py index 8ae55d9..2cf1af0 100644 --- a/src/osmo_gsm_tester/core/log.py +++ b/src/osmo_gsm_tester/core/log.py @@ -88,8 +88,17 @@ get_process_id = lambda: '%d-%d' % (os.getpid(), time.time()) class Error(Exception): -def __init__(self, *messages, **named_items): -super().__init__(compose_message(messages, named_items)) +def __init__(self, *messages, origin=None, **named_items): +msg = '' +if origin is None: +origin = Origin.find_on_stack(f=sys._getframe(1)) +if origin: +msg += origin.name() + ': ' +msg += compose_message(messages, named_items) +if origin and origin._parent is not None: +deeper_origins = origin.ancestry_str() +msg += ' [%s]' % deeper_origins +super().__init__(msg) class LogTarget: all_targets = [] -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18658 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: I8873f67a2f3df21c4dd552c92510535bf95e2c9d Gerrit-Change-Number: 18658 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: process: Fix wrong use of log.ctx(self)
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18657 ) Change subject: process: Fix wrong use of log.ctx(self) .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18657 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: I4ab7e8977fa9bad5c8956b7c1df1513b27bb5aa2 Gerrit-Change-Number: 18657 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Jun 2020 09:01:47 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: testenv: Get rid of 'resources' global variable
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18660 ) Change subject: testenv: Get rid of 'resources' global variable .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18660 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: Id7576d21d0f9de29dd9bc4211eaf9b9ec634c990 Gerrit-Change-Number: 18660 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Jun 2020 09:01:52 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: log: Improve log ctx information in log.Error exception
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18658 ) Change subject: log: Improve log ctx information in log.Error exception .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18658 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: I8873f67a2f3df21c4dd552c92510535bf95e2c9d Gerrit-Change-Number: 18658 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Jun 2020 09:01:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: doc: manual: Write initial Test API section
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18663 ) Change subject: doc: manual: Write initial Test API section .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18663 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: I86bc9a8a0b5ff50e72c21a4bd8a857830bd84c4c Gerrit-Change-Number: 18663 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Jun 2020 09:01:58 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: process: Improve launch_sync() exception due to process failing
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18659 ) Change subject: process: Improve launch_sync() exception due to process failing .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18659 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: Ia16c7dec96f70d761600ad6a50d9df8382d9c2c8 Gerrit-Change-Number: 18659 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Jun 2020 09:01:50 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: testenv: Support test overlaying a directory to look for templates
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18662 ) Change subject: testenv: Support test overlaying a directory to look for templates .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18662 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: I65d1b1e826d2d430ee83810d998b98d0ccaa07cd Gerrit-Change-Number: 18662 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Jun 2020 09:01:56 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: rsl: refactor handling of RSL_IE_MR_CONFIG
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18680 ) Change subject: rsl: refactor handling of RSL_IE_MR_CONFIG .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/18680/1/src/common/amr.c File src/common/amr.c: https://gerrit.osmocom.org/c/osmo-bts/+/18680/1/src/common/amr.c@135 PS1, Line 135: amr_mrc->bts_mode[2].threshold = before doing this we should check if "len > 4" -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibfd5845ea429945b352dd14421e86562998d65ca Gerrit-Change-Number: 18680 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Jun 2020 08:57:09 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bts[master]: doc/examples: remove virtual/openbsc-virtual.cfg
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18681 ) Change subject: doc/examples: remove virtual/openbsc-virtual.cfg .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib165b16f948126df8023bb42ad5d6d4b2fc11e6a Gerrit-Change-Number: 18681 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Jun 2020 08:51:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: doc/examples: remove virtual/openbsc-virtual.cfg
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/18681 to look at the new patch set (#2). Change subject: doc/examples: remove virtual/openbsc-virtual.cfg .. doc/examples: remove virtual/openbsc-virtual.cfg This is not the right place to ship configuration examples for other projects, and definitely not for abandoned ones. Change-Id: Ib165b16f948126df8023bb42ad5d6d4b2fc11e6a --- M contrib/osmo-bts.spec.in M debian/osmo-bts-virtual.install M doc/examples/Makefile.am D doc/examples/virtual/openbsc-virtual.cfg 4 files changed, 1 insertion(+), 155 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/81/18681/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib165b16f948126df8023bb42ad5d6d4b2fc11e6a Gerrit-Change-Number: 18681 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset