Build failure of network:osmocom:nightly/osmo-trx in Debian_Testing/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 418s] ar: `u' modifier ignored since `D' is the default (see `U') [ 418s] libtool: link: ranlib .libs/libtransceiver_common.a [ 418s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 418s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 419s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 419s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 419s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 419s] collect2: error: ld returned 1 exit status [ 419s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 419s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 419s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 419s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 419s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 419s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 419s] make[1]: *** [Makefile:444: all] Error 2 [ 419s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 419s] dh_auto_build: make -j1 returned exit code 2 [ 419s] make: *** [debian/rules:6: build] Error 255 [ 419s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 419s] [ 419s] lamb07 failed "build osmo-trx_1.1.1.15.923b.dsc" at Sat Sep 14 01:49:38 UTC 2019. [ 419s] [ 419s] ### VM INTERACTION START ### [ 422s] [ 403.987023] sysrq: SysRq : Power Off [ 422s] [ 403.994227] reboot: Power down [ 422s] ### VM INTERACTION END ### [ 422s] [ 422s] lamb07 failed "build osmo-trx_1.1.1.15.923b.dsc" at Sat Sep 14 01:49:41 UTC 2019. [ 422s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 411s] ar: `u' modifier ignored since `D' is the default (see `U') [ 411s] libtool: link: ranlib .libs/libtransceiver_common.a [ 411s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 411s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 411s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 411s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 411s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 411s] collect2: error: ld returned 1 exit status [ 411s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 411s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 411s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 411s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 411s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 411s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 411s] make[1]: *** [Makefile:444: all] Error 2 [ 411s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 411s] dh_auto_build: make -j1 returned exit code 2 [ 411s] make: *** [debian/rules:6: build] Error 255 [ 411s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 411s] [ 411s] lamb18 failed "build osmo-trx_1.1.1.15.923b.dsc" at Sat Sep 14 01:45:44 UTC 2019. [ 411s] [ 411s] ### VM INTERACTION START ### [ 415s] [ 396.890264] sysrq: SysRq : Power Off [ 415s] [ 396.898113] reboot: Power down [ 415s] ### VM INTERACTION END ### [ 415s] [ 415s] lamb18 failed "build osmo-trx_1.1.1.15.923b.dsc" at Sat Sep 14 01:45:48 UTC 2019. [ 415s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Change in ...osmo-trx[master]: radioInterface: Atomically fetch and change underrun variable
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/15524 Change subject: radioInterface: Atomically fetch and change underrun variable .. radioInterface: Atomically fetch and change underrun variable Otherwise, it could happen that underrun events are lost: TxLower (isUnderrun): RxLower (pullBuffer): read(underrun) read(underrun) write(underrun, |val) [maybe underrun becomes TRUE] write(underrun, false) Similary, it could happen the other direction if atomic was only applied to isUnderrun: TxLower (isUnderrun): RxLower (pullBuffer): read(underrun) -> true read(underrun)-> true write(underrun, false) write(underrun, true|val) where val=false So in here isUnderrun would return true twice while it should only return one. Change-Id: I684e0a5d2a9583a161d5a6593559b3a9e7cd57e3 --- M Transceiver52M/radioInterface.cpp M Transceiver52M/radioInterface.h M Transceiver52M/radioInterfaceMulti.cpp M Transceiver52M/radioInterfaceResamp.cpp 4 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/24/15524/1 diff --git a/Transceiver52M/radioInterface.cpp b/Transceiver52M/radioInterface.cpp index 6e49a75..bfd6099 100644 --- a/Transceiver52M/radioInterface.cpp +++ b/Transceiver52M/radioInterface.cpp @@ -288,9 +288,9 @@ bool RadioInterface::isUnderrun() { - bool retVal = underrun; - underrun = false; - + bool retVal; + /* atomically get previous value of "underrun" and set the var to false */ + retVal = __sync_fetch_and_and(, false); return retVal; } @@ -340,7 +340,7 @@ segmentLen * 2); } - underrun |= local_underrun; + __sync_or_and_fetch(, local_underrun); readTimestamp += numRecv; return 0; } @@ -366,7 +366,7 @@ segmentLen, _underrun, writeTimestamp); - underrun |= local_underrun; + __sync_or_and_fetch(, local_underrun); writeTimestamp += numSent; return true; diff --git a/Transceiver52M/radioInterface.h b/Transceiver52M/radioInterface.h index 83e00b9..6f4deaa 100644 --- a/Transceiver52M/radioInterface.h +++ b/Transceiver52M/radioInterface.h @@ -48,7 +48,7 @@ std::vector convertRecvBuffer; std::vector convertSendBuffer; std::vector powerScaling; - bool underrun; ///< indicates writes to USRP are too slow + int underrun; ///< indicates writes to USRP are too slow bool overrun; ///< indicates reads from USRP are too slow TIMESTAMP writeTimestamp; ///< sample timestamp of next packet written to USRP TIMESTAMP readTimestamp; ///< sample timestamp of next packet read from USRP diff --git a/Transceiver52M/radioInterfaceMulti.cpp b/Transceiver52M/radioInterfaceMulti.cpp index 99f6231..8060e73 100644 --- a/Transceiver52M/radioInterfaceMulti.cpp +++ b/Transceiver52M/radioInterfaceMulti.cpp @@ -251,7 +251,7 @@ convert_short_float((float *) outerRecvBuffer->begin(), convertRecvBuffer[0], 2 * outerRecvBuffer->size()); - underrun |= local_underrun; + __sync_or_and_fetch(, local_underrun); readTimestamp += num; channelizer->rotate((float *) outerRecvBuffer->begin(), @@ -348,7 +348,7 @@ LOG(ALERT) << "Transmit error " << num; } - underrun |= local_underrun; + __sync_or_and_fetch(, local_underrun); writeTimestamp += num; return true; diff --git a/Transceiver52M/radioInterfaceResamp.cpp b/Transceiver52M/radioInterfaceResamp.cpp index 864cdee..03551ee 100644 --- a/Transceiver52M/radioInterfaceResamp.cpp +++ b/Transceiver52M/radioInterfaceResamp.cpp @@ -184,7 +184,7 @@ convert_short_float((float *) outerRecvBuffer->begin(), convertRecvBuffer[0], 2 * resamp_outchunk); - underrun |= local_underrun; + __sync_or_and_fetch(, local_underrun); readTimestamp += (TIMESTAMP) resamp_outchunk; /* Write to the end of the inner receive buffer */ @@ -232,7 +232,7 @@ LOG(ALERT) << "Transmit error " << numSent; } - underrun |= local_underrun; + __sync_or_and_fetch(, local_underrun); writeTimestamp += resamp_outchunk; return true; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I684e0a5d2a9583a161d5a6593559b3a9e7cd57e3 Gerrit-Change-Number: 15524 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...osmo-trx[master]: radioInterface{Multi, Resamp}: Fix successful writeSamples() masking u...
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/15523 Change subject: radioInterface{Multi,Resamp}: Fix successful writeSamples() masking underrun from readSamples() .. radioInterface{Multi,Resamp}: Fix successful writeSamples() masking underrun from readSamples() The only who should be setting class instance value "underrun" to false is isUnderrun(). Similar fixes were already applied lately to radioInterface.cpp. Change-Id: I3239b1df4536c080365106b3e4daa523b57f5dff --- M Transceiver52M/radioInterfaceMulti.cpp M Transceiver52M/radioInterfaceResamp.cpp 2 files changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/23/15523/1 diff --git a/Transceiver52M/radioInterfaceMulti.cpp b/Transceiver52M/radioInterfaceMulti.cpp index 4022d3a..99f6231 100644 --- a/Transceiver52M/radioInterfaceMulti.cpp +++ b/Transceiver52M/radioInterfaceMulti.cpp @@ -309,6 +309,7 @@ /* Send a timestamped chunk to the device */ bool RadioInterfaceMulti::pushBuffer() { + bool local_underrun; if (sendBuffer[0]->getAvailSegments() <= 0) return false; @@ -341,12 +342,13 @@ size_t num = mDevice->writeSamples(convertSendBuffer, outerSendBuffer->size(), - , + _underrun, writeTimestamp); if (num != outerSendBuffer->size()) { LOG(ALERT) << "Transmit error " << num; } + underrun |= local_underrun; writeTimestamp += num; return true; diff --git a/Transceiver52M/radioInterfaceResamp.cpp b/Transceiver52M/radioInterfaceResamp.cpp index d6dc52c..864cdee 100644 --- a/Transceiver52M/radioInterfaceResamp.cpp +++ b/Transceiver52M/radioInterfaceResamp.cpp @@ -204,6 +204,7 @@ /* Send a timestamped chunk to the device */ bool RadioInterfaceResamp::pushBuffer() { + bool local_underrun; int rc; size_t numSent; @@ -225,12 +226,13 @@ numSent = mDevice->writeSamples(convertSendBuffer, resamp_outchunk, - , + _underrun, writeTimestamp); if (numSent != resamp_outchunk) { LOG(ALERT) << "Transmit error " << numSent; } + underrun |= local_underrun; writeTimestamp += resamp_outchunk; return true; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15523 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3239b1df4536c080365106b3e4daa523b57f5dff Gerrit-Change-Number: 15523 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...osmo-trx[master]: UHDDevice: Drop unneeded MULTI_ARFCN checks
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/15522 Change subject: UHDDevice: Drop unneeded MULTI_ARFCN checks .. UHDDevice: Drop unneeded MULTI_ARFCN checks After previous changes, radioInterfaceMulti is expected to handle channel conversion correctly, so it will always use chan 0 for all these functions. This simplifies code in radioDevice avoiding need to add checks to all devices supporting multi-arfcn in the future. Change-Id: Ib2cd50a6ceaeedc6aaf3e1bb51d33b52911b6eba --- M Transceiver52M/device/uhd/UHDDevice.cpp 1 file changed, 0 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/22/15522/1 diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp index 3b59291..809bade 100644 --- a/Transceiver52M/device/uhd/UHDDevice.cpp +++ b/Transceiver52M/device/uhd/UHDDevice.cpp @@ -247,9 +247,6 @@ double uhd_device::setTxGain(double db, size_t chan) { - if (iface == MULTI_ARFCN) - chan = 0; - if (chan >= tx_gains.size()) { LOGC(DDEV, ALERT) << "Requested non-existent channel" << chan; return 0.0f; @@ -281,9 +278,6 @@ double uhd_device::setRxGain(double db, size_t chan) { - if (iface == MULTI_ARFCN) - chan = 0; - if (chan >= rx_gains.size()) { LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return 0.0f; @@ -299,9 +293,6 @@ double uhd_device::getRxGain(size_t chan) { - if (iface == MULTI_ARFCN) - chan = 0; - if (chan >= rx_gains.size()) { LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return 0.0f; @@ -312,9 +303,6 @@ double uhd_device::getTxGain(size_t chan) { - if (iface == MULTI_ARFCN) - chan = 0; - if (chan >= tx_gains.size()) { LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return 0.0f; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15522 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ib2cd50a6ceaeedc6aaf3e1bb51d33b52911b6eba Gerrit-Change-Number: 15522 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...osmo-trx[master]: LMSDevice: Return previous txGain/rxGain if setting value failed
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/15518 Change subject: LMSDevice: Return previous txGain/rxGain if setting value failed .. LMSDevice: Return previous txGain/rxGain if setting value failed Change-Id: I11e853e11bec99fc88e81642f9b2cd87d5815398 --- M Transceiver52M/device/lms/LMSDevice.cpp M Transceiver52M/device/lms/LMSDevice.h 2 files changed, 10 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/18/15518/1 diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index b7cb31d..feeb646 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -55,6 +55,8 @@ m_lms_stream_rx.resize(chans); m_lms_stream_tx.resize(chans); + rx_gains.resize(chans); + tx_gains.resize(chans); rx_buffers.resize(chans); } @@ -412,8 +414,9 @@ if (LMS_SetGaindB(m_lms_dev, LMS_CH_TX, chan, dB) < 0) LOGCHAN(chan, DDEV, ERR) << "Error setting TX gain to " << dB << " dB"; - - return dB; + else + tx_gains[chan] = dB; + return tx_gains[chan]; } double LMSDevice::setRxGain(double dB, size_t chan) @@ -427,8 +430,9 @@ if (LMS_SetGaindB(m_lms_dev, LMS_CH_RX, chan, dB) < 0) LOGCHAN(chan, DDEV, ERR) << "Error setting RX gain to " << dB << " dB"; - - return dB; + else + rx_gains[chan] = dB; + return rx_gains[chan]; } void LMSDevice::log_ant_list(bool dir_tx, size_t chan, std::ostringstream& os) diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h index ab45b08..71a706c 100644 --- a/Transceiver52M/device/lms/LMSDevice.h +++ b/Transceiver52M/device/lms/LMSDevice.h @@ -58,7 +58,7 @@ TIMESTAMP ts_initial, ts_offset; - double rxGain; + std::vector tx_gains, rx_gains; double maxTxGainClamp; bool do_calib(size_t chan); @@ -150,7 +150,7 @@ /** get the current receive gain */ double getRxGain(size_t chan = 0) { - return rxGain; + return rx_gains[chan]; } /** return maximum Rx Gain **/ -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15518 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I11e853e11bec99fc88e81642f9b2cd87d5815398 Gerrit-Change-Number: 15518 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...osmo-trx[master]: radioInterface: Remove unusued getRxGain()
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/15519 Change subject: radioInterface: Remove unusued getRxGain() .. radioInterface: Remove unusued getRxGain() Only the radioDevice->getRxGain() is called from inside radioInterfaceMulti, so the API in radioInterface is not used at all. Change-Id: Icc4e9a7ebfdafe7c72c535752a5e379d12592c9a --- M Transceiver52M/radioInterface.cpp M Transceiver52M/radioInterface.h 2 files changed, 0 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/19/15519/1 diff --git a/Transceiver52M/radioInterface.cpp b/Transceiver52M/radioInterface.cpp index bd19b24..9c7c044 100644 --- a/Transceiver52M/radioInterface.cpp +++ b/Transceiver52M/radioInterface.cpp @@ -307,11 +307,6 @@ return mDevice->setRxGain(dB, chan); } -double RadioInterface::getRxGain(size_t chan) -{ - return mDevice->getRxGain(chan); -} - /* Receive a timestamped chunk from the device */ int RadioInterface::pullBuffer() { diff --git a/Transceiver52M/radioInterface.h b/Transceiver52M/radioInterface.h index 235d888..945624a 100644 --- a/Transceiver52M/radioInterface.h +++ b/Transceiver52M/radioInterface.h @@ -109,9 +109,6 @@ /** set receive gain */ double setRxGain(double dB, size_t chan = 0); - /** get receive gain */ - double getRxGain(size_t chan = 0); - /** drive transmission of GSM bursts */ void driveTransmitRadio(std::vector , std::vector ); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Icc4e9a7ebfdafe7c72c535752a5e379d12592c9a Gerrit-Change-Number: 15519 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...osmo-trx[master]: radioInterface: Rename mRadio to mDevice
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/15514 Change subject: radioInterface: Rename mRadio to mDevice .. radioInterface: Rename mRadio to mDevice Previous naming is ready confusing, because "Radio" is actually the common term between radioInterface and radioDevice, and it looks like it's referring to radioInterface rather than radioDevice. On the other hand, mDevice cleary states it refers to the radioDevice item. Change-Id: I708bb1992a156fb63334f5590f2c6648ca27495e --- M Transceiver52M/radioInterface.cpp M Transceiver52M/radioInterface.h M Transceiver52M/radioInterfaceMulti.cpp M Transceiver52M/radioInterfaceResamp.cpp 4 files changed, 37 insertions(+), 37 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/14/15514/1 diff --git a/Transceiver52M/radioInterface.cpp b/Transceiver52M/radioInterface.cpp index 0d33f22..bd19b24 100644 --- a/Transceiver52M/radioInterface.cpp +++ b/Transceiver52M/radioInterface.cpp @@ -32,10 +32,10 @@ #define CHUNK 625 #define NUMCHUNKS 4 -RadioInterface::RadioInterface(RadioDevice *wRadio, size_t tx_sps, +RadioInterface::RadioInterface(RadioDevice *wDevice, size_t tx_sps, size_t rx_sps, size_t chans, int wReceiveOffset, GSM::Time wStartTime) - : mRadio(wRadio), mSPSTx(tx_sps), mSPSRx(rx_sps), mChans(chans), + : mDevice(wDevice), mSPSTx(tx_sps), mSPSRx(rx_sps), mChans(chans), underrun(false), overrun(false), writeTimestamp(0), readTimestamp(0), receiveOffset(wReceiveOffset), mOn(false) { @@ -93,11 +93,11 @@ } double RadioInterface::fullScaleInputValue(void) { - return mRadio->fullScaleInputValue(); + return mDevice->fullScaleInputValue(); } double RadioInterface::fullScaleOutputValue(void) { - return mRadio->fullScaleOutputValue(); + return mDevice->fullScaleOutputValue(); } int RadioInterface::setPowerAttenuation(int atten, size_t chan) @@ -112,8 +112,8 @@ if (atten < 0.0) atten = 0.0; - rfGain = mRadio->setTxGain(mRadio->maxTxGain() - (double) atten, chan); - digAtten = (double) atten - mRadio->maxTxGain() + rfGain; + rfGain = mDevice->setTxGain(mDevice->maxTxGain() - (double) atten, chan); + digAtten = (double) atten - mDevice->maxTxGain() + rfGain; if (digAtten < 1.0) powerScaling[chan] = 1.0; @@ -148,12 +148,12 @@ bool RadioInterface::tuneTx(double freq, size_t chan) { - return mRadio->setTxFreq(freq, chan); + return mDevice->setTxFreq(freq, chan); } bool RadioInterface::tuneRx(double freq, size_t chan) { - return mRadio->setRxFreq(freq, chan); + return mDevice->setRxFreq(freq, chan); } /** synchronization thread loop */ @@ -169,7 +169,7 @@ } void RadioInterface::alignRadio() { - mRadio->updateAlignment(writeTimestamp+ (TIMESTAMP) 1); + mDevice->updateAlignment(writeTimestamp+ (TIMESTAMP) 1); } bool RadioInterface::start() @@ -178,12 +178,12 @@ return true; LOG(INFO) << "Starting radio device"; - if (mRadio->requiresRadioAlign()) + if (mDevice->requiresRadioAlign()) mAlignRadioServiceLoopThread.start( (void * (*)(void*))AlignRadioServiceLoopAdapter, (void*)this); - if (!mRadio->start()) + if (!mDevice->start()) return false; for (size_t i = 0; i < mChans; i++) { @@ -191,11 +191,11 @@ recvBuffer[i]->reset(); } - writeTimestamp = mRadio->initialWriteTimestamp(); - readTimestamp = mRadio->initialReadTimestamp(); + writeTimestamp = mDevice->initialWriteTimestamp(); + readTimestamp = mDevice->initialReadTimestamp(); - mRadio->updateAlignment(writeTimestamp-1); - mRadio->updateAlignment(writeTimestamp-1); + mDevice->updateAlignment(writeTimestamp-1); + mDevice->updateAlignment(writeTimestamp-1); mOn = true; LOG(INFO) << "Radio started"; @@ -211,7 +211,7 @@ */ bool RadioInterface::stop() { - if (!mOn || !mRadio->stop()) + if (!mOn || !mDevice->stop()) return false; mOn = false; @@ -304,12 +304,12 @@ double RadioInterface::setRxGain(double dB, size_t chan) { - return mRadio->setRxGain(dB, chan); + return mDevice->setRxGain(dB, chan); } double RadioInterface::getRxGain(size_t chan) { - return mRadio->getRxGain(chan); + return mDevice->getRxGain(chan); } /* Receive a timestamped chunk from the device */ @@ -323,7 +323,7 @@ return -1; /* Outer buffer access size is fixed */ - numRecv = mRadio->readSamples(convertRecvBuffer, + numRecv = mDevice->readSamples(convertRecvBuffer, segmentLen, , readTimestamp, @@ -362,7 +362,7 @@ } /* Send the all samples in the send buffer */ - numSent = mRadio->writeSamples(convertSendBuffer, + numSent = mDevice->writeSamples(convertSendBuffer,
Change in ...osmo-trx[master]: USRPDevice: Fix setRxGain return on error and getRxGain() returning a...
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/15516 Change subject: USRPDevice: Fix setRxGain return on error and getRxGain() returning always 0 .. USRPDevice: Fix setRxGain return on error and getRxGain() returning always 0 field rxGain is set to 0 during constructor and never set after that point. Change-Id: I7fae7a315e5ab98a15c27628a88a92226ef89469 --- M Transceiver52M/device/usrp1/USRPDevice.cpp 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/16/15516/1 diff --git a/Transceiver52M/device/usrp1/USRPDevice.cpp b/Transceiver52M/device/usrp1/USRPDevice.cpp index 63debee..ef3f92a 100644 --- a/Transceiver52M/device/usrp1/USRPDevice.cpp +++ b/Transceiver52M/device/usrp1/USRPDevice.cpp @@ -305,10 +305,11 @@ if (!m_dbRx->set_gain(dB)) LOGC(DDEV, ERR) << "Error setting RX gain"; - + else +rxGain = dB; writeLock.unlock(); - return dB; + return rxGain; } bool USRPDevice::setRxAntenna(const std::string , size_t chan) -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15516 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I7fae7a315e5ab98a15c27628a88a92226ef89469 Gerrit-Change-Number: 15516 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...osmo-trx[master]: USRPDevice: Return previous txGain if setting value failed
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/15517 Change subject: USRPDevice: Return previous txGain if setting value failed .. USRPDevice: Return previous txGain if setting value failed Change-Id: I0d8fd51586ef01141d4e5896f0fc3029a22743f8 --- M Transceiver52M/device/usrp1/USRPDevice.cpp M Transceiver52M/device/usrp1/USRPDevice.h 2 files changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/17/15517/1 diff --git a/Transceiver52M/device/usrp1/USRPDevice.cpp b/Transceiver52M/device/usrp1/USRPDevice.cpp index ef3f92a..03a4f80 100644 --- a/Transceiver52M/device/usrp1/USRPDevice.cpp +++ b/Transceiver52M/device/usrp1/USRPDevice.cpp @@ -71,6 +71,7 @@ decimRate = (unsigned int) round(masterClockRate/((GSMRATE) * (double) tx_sps)); actualSampleRate = masterClockRate/decimRate; rxGain = 0; + txGain = 0; /* * Undetermined delay b/w ping response timestamp and true @@ -279,10 +280,11 @@ if (!m_dbTx->set_gain(dB)) LOGC(DDEV, ERR) << "Error setting TX gain"; - + else +txGain = dB; writeLock.unlock(); - return dB; + return txGain; } diff --git a/Transceiver52M/device/usrp1/USRPDevice.h b/Transceiver52M/device/usrp1/USRPDevice.h index 4123c7d..734b361 100644 --- a/Transceiver52M/device/usrp1/USRPDevice.h +++ b/Transceiver52M/device/usrp1/USRPDevice.h @@ -80,6 +80,7 @@ unsigned long lastPktTimestamp; double rxGain; + double txGain; #ifdef SWLOOPBACK short loopbackBuffer[100]; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15517 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I0d8fd51586ef01141d4e5896f0fc3029a22743f8 Gerrit-Change-Number: 15517 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...osmo-trx[master]: radioInterfaceMulti: Override setTxGain() to avoid chan!=0 calls
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/15521 Change subject: radioInterfaceMulti: Override setTxGain() to avoid chan!=0 calls .. radioInterfaceMulti: Override setTxGain() to avoid chan!=0 calls Change-Id: I7e67f660c3b0b009db59b405de603f6058021802 --- M Transceiver52M/radioInterface.cpp M Transceiver52M/radioInterface.h M Transceiver52M/radioInterfaceMulti.cpp 3 files changed, 19 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/21/15521/1 diff --git a/Transceiver52M/radioInterface.cpp b/Transceiver52M/radioInterface.cpp index 9c7c044..6e49a75 100644 --- a/Transceiver52M/radioInterface.cpp +++ b/Transceiver52M/radioInterface.cpp @@ -112,7 +112,7 @@ if (atten < 0.0) atten = 0.0; - rfGain = mDevice->setTxGain(mDevice->maxTxGain() - (double) atten, chan); + rfGain = setTxGain(mDevice->maxTxGain() - (double) atten, chan); digAtten = (double) atten - mDevice->maxTxGain() + rfGain; if (digAtten < 1.0) @@ -307,6 +307,11 @@ return mDevice->setRxGain(dB, chan); } +double RadioInterface::setTxGain(double dB, size_t chan) +{ + return mDevice->setTxGain(dB, chan); +} + /* Receive a timestamped chunk from the device */ int RadioInterface::pullBuffer() { diff --git a/Transceiver52M/radioInterface.h b/Transceiver52M/radioInterface.h index 945624a..83e00b9 100644 --- a/Transceiver52M/radioInterface.h +++ b/Transceiver52M/radioInterface.h @@ -134,6 +134,9 @@ /** drive synchronization of Tx/Rx of USRP */ void alignRadio(); + /** set transmit gain */ + virtual double setTxGain(double dB, size_t chan = 0); + friend void *AlignRadioServiceLoopAdapter(RadioInterface*); }; @@ -157,6 +160,7 @@ private: bool pushBuffer(); int pullBuffer(); + virtual double setTxGain(double dB, size_t chan); signalVector *outerSendBuffer; signalVector *outerRecvBuffer; diff --git a/Transceiver52M/radioInterfaceMulti.cpp b/Transceiver52M/radioInterfaceMulti.cpp index c41ec22..4022d3a 100644 --- a/Transceiver52M/radioInterfaceMulti.cpp +++ b/Transceiver52M/radioInterfaceMulti.cpp @@ -405,3 +405,12 @@ else return mDevice->getRxGain(); } + +double RadioInterfaceMulti::setTxGain(double dB, size_t chan) +{ + if (chan == 0) + return mDevice->setTxGain(dB); + else + return mDevice->getTxGain(); + +} -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I7e67f660c3b0b009db59b405de603f6058021802 Gerrit-Change-Number: 15521 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...osmo-trx[master]: radioDevice: Introduce getTxGain() API
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/15520 Change subject: radioDevice: Introduce getTxGain() API .. radioDevice: Introduce getTxGain() API It will be used in later commits by radioInterfaceMulti. Change-Id: Ie3caca8971ed1e5370dfed6fb60716a24e7d82a5 --- M Transceiver52M/device/common/radioDevice.h M Transceiver52M/device/lms/LMSDevice.h M Transceiver52M/device/uhd/UHDDevice.cpp M Transceiver52M/device/uhd/UHDDevice.h M Transceiver52M/device/usrp1/USRPDevice.h 5 files changed, 25 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/20/15520/1 diff --git a/Transceiver52M/device/common/radioDevice.h b/Transceiver52M/device/common/radioDevice.h index b4928f2..1d85204 100644 --- a/Transceiver52M/device/common/radioDevice.h +++ b/Transceiver52M/device/common/radioDevice.h @@ -131,6 +131,9 @@ /** sets the transmit chan gain, returns the gain setting **/ virtual double setTxGain(double dB, size_t chan = 0) = 0; + /** get transmit gain */ + virtual double getTxGain(size_t chan = 0) = 0; + /** return maximum Tx Gain **/ virtual double maxTxGain(void) = 0; diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h index 71a706c..1464c53 100644 --- a/Transceiver52M/device/lms/LMSDevice.h +++ b/Transceiver52M/device/lms/LMSDevice.h @@ -162,6 +162,11 @@ /** sets the transmit chan gain, returns the gain setting **/ double setTxGain(double dB, size_t chan = 0); + /** get transmit gain */ + double getTxGain(size_t chan = 0) { + return tx_gains[chan]; + } + /** return maximum Tx Gain **/ double maxTxGain(void); diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp index 5b38df4..3b59291 100644 --- a/Transceiver52M/device/uhd/UHDDevice.cpp +++ b/Transceiver52M/device/uhd/UHDDevice.cpp @@ -310,6 +310,19 @@ return rx_gains[chan]; } +double uhd_device::getTxGain(size_t chan) +{ + if (iface == MULTI_ARFCN) + chan = 0; + + if (chan >= tx_gains.size()) { + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; + return 0.0f; + } + + return tx_gains[chan]; +} + /* Parse the UHD device tree and mboard name to find out what device we're dealing with. We need the window type so that the transceiver knows how to diff --git a/Transceiver52M/device/uhd/UHDDevice.h b/Transceiver52M/device/uhd/UHDDevice.h index 944578a..44f7ebb 100644 --- a/Transceiver52M/device/uhd/UHDDevice.h +++ b/Transceiver52M/device/uhd/UHDDevice.h @@ -96,6 +96,7 @@ double minRxGain(void) { return rx_gain_min; } double setTxGain(double db, size_t chan); + double getTxGain(size_t chan = 0); double maxTxGain(void) { return tx_gain_max; } double minTxGain(void) { return tx_gain_min; } diff --git a/Transceiver52M/device/usrp1/USRPDevice.h b/Transceiver52M/device/usrp1/USRPDevice.h index 734b361..bb70648 100644 --- a/Transceiver52M/device/usrp1/USRPDevice.h +++ b/Transceiver52M/device/usrp1/USRPDevice.h @@ -171,6 +171,9 @@ /** sets the transmit chan gain, returns the gain setting **/ double setTxGain(double dB, size_t chan = 0); + /** get transmit gain */ + double getTxGain(size_t chan = 0) { return txGain; } + /** return maximum Tx Gain **/ double maxTxGain(void); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15520 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ie3caca8971ed1e5370dfed6fb60716a24e7d82a5 Gerrit-Change-Number: 15520 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...osmo-trx[master]: radioInterfaceMulti: Check equals zero explicitly
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/15515 Change subject: radioInterfaceMulti: Check equals zero explicitly .. radioInterfaceMulti: Check equals zero explicitly It's not a pointer check or a boolean expression, in here we really check chan index is 0, so it's more clear doing so this way like it's done in all other places. Change-Id: I83b14487d14ba8272f58796f640f58a88891e532 --- M Transceiver52M/radioInterfaceMulti.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/15/15515/1 diff --git a/Transceiver52M/radioInterfaceMulti.cpp b/Transceiver52M/radioInterfaceMulti.cpp index 7c1ee74..c41ec22 100644 --- a/Transceiver52M/radioInterfaceMulti.cpp +++ b/Transceiver52M/radioInterfaceMulti.cpp @@ -400,7 +400,7 @@ double RadioInterfaceMulti::setRxGain(double db, size_t chan) { - if (!chan) + if (chan == 0) return mDevice->setRxGain(db); else return mDevice->getRxGain(); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15515 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I83b14487d14ba8272f58796f640f58a88891e532 Gerrit-Change-Number: 15515 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...osmo-ttcn3-hacks[master]: sgsn: TC_attach_check_complete_resend: Expect LU sent to HLR
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15475 ) Change subject: sgsn: TC_attach_check_complete_resend: Expect LU sent to HLR .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15475 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: Ie2e8f5b9740c7429f5f0bf28e35707a61f23b565 Gerrit-Change-Number: 15475 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 13 Sep 2019 15:23:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-pcu[master]: Use osmo_tdef to implement dl-tbf-idle-time
Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/15454 to look at the new patch set (#4). Change subject: Use osmo_tdef to implement dl-tbf-idle-time .. Use osmo_tdef to implement dl-tbf-idle-time Change-Id: I5e4f0d2f90e643600b7752525d6c2830856c9d3b --- M src/bts.cpp M src/bts.h M src/gprs_rlcmac_sched.cpp M src/pcu_main.cpp M src/pcu_vty.c M src/tbf_dl.cpp M tests/tbf/TbfTest.cpp 7 files changed, 28 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/54/15454/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15454 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5e4f0d2f90e643600b7752525d6c2830856c9d3b Gerrit-Change-Number: 15454 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset
Change in ...osmo-pcu[master]: Use osmo_tdef to implement ms-idle-time
Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/15453 to look at the new patch set (#4). Change subject: Use osmo_tdef to implement ms-idle-time .. Use osmo_tdef to implement ms-idle-time This commit would also remove the option from config_write_pcu() since it's automatically filled in by osmo_tdef, but there was actually a bug because that param was never printed when saving the config... Change-Id: Id8e70b0f44ef2f7e20ecdb3fd8ca93ae2a05b9a3 --- M src/bts.cpp M src/bts.h M src/pcu_main.cpp M src/pcu_vty.c M tests/tbf/TbfTest.cpp 5 files changed, 15 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/53/15453/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15453 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id8e70b0f44ef2f7e20ecdb3fd8ca93ae2a05b9a3 Gerrit-Change-Number: 15453 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset
Change in ...osmo-ci[master]: jenkins-jobs: Add ttcn3-remsim-test for {master, latest]
laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ci/+/15513 ) Change subject: jenkins-jobs: Add ttcn3-remsim-test for {master,latest] .. jenkins-jobs: Add ttcn3-remsim-test for {master,latest] Change-Id: Ib4e3f3f0153c38765868cfd2014cd56cd47c2c79 --- M jobs/ttcn3-testsuites.yml 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index f42a26f..3d1731a 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -39,6 +39,8 @@ timer: 00 08 * * * - ttcn3-bsc-test-sccplite: timer: 30 08 * * * + - ttcn3-remsim-test: + timer: 00 09 * * * # latest stable - nplab-m3ua-test-latest: @@ -69,6 +71,8 @@ blocking: "^ttcn3-pcu-test-sns.*" - ttcn3-bscnat-test-latest: blocking: "^ttcn3-bscnat-test.*" + - ttcn3-remsim-test-latest: + blocking: "^ttcn3-remsim-test.*" - job-template: name: '{job-name}' project-type: freestyle -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15513 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib4e3f3f0153c38765868cfd2014cd56cd47c2c79 Gerrit-Change-Number: 15513 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in ...osmo-ci[master]: jenkins-jobs: Add ttcn3-remsim-test for {master, latest]
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/15513 ) Change subject: jenkins-jobs: Add ttcn3-remsim-test for {master,latest] .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15513 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib4e3f3f0153c38765868cfd2014cd56cd47c2c79 Gerrit-Change-Number: 15513 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 13 Sep 2019 12:06:19 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ci[master]: jenkins-jobs: Add ttcn3-remsim-test for {master, latest]
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/15513 Change subject: jenkins-jobs: Add ttcn3-remsim-test for {master,latest] .. jenkins-jobs: Add ttcn3-remsim-test for {master,latest] Change-Id: Ib4e3f3f0153c38765868cfd2014cd56cd47c2c79 --- M jobs/ttcn3-testsuites.yml 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/13/15513/1 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index f42a26f..3d1731a 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -39,6 +39,8 @@ timer: 00 08 * * * - ttcn3-bsc-test-sccplite: timer: 30 08 * * * + - ttcn3-remsim-test: + timer: 00 09 * * * # latest stable - nplab-m3ua-test-latest: @@ -69,6 +71,8 @@ blocking: "^ttcn3-pcu-test-sns.*" - ttcn3-bscnat-test-latest: blocking: "^ttcn3-bscnat-test.*" + - ttcn3-remsim-test-latest: + blocking: "^ttcn3-remsim-test.*" - job-template: name: '{job-name}' project-type: freestyle -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15513 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib4e3f3f0153c38765868cfd2014cd56cd47c2c79 Gerrit-Change-Number: 15513 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange
Change in ...docker-playground[master]: Add 'osmo-remsim-latest' container
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/15512 ) Change subject: Add 'osmo-remsim-latest' container .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15512 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If16d4038a3c9a0532ae3a59762c68e40c18a9236 Gerrit-Change-Number: 15512 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 13 Sep 2019 11:58:44 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...docker-playground[master]: Add 'osmo-remsim-latest' container
laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/docker-playground/+/15512 ) Change subject: Add 'osmo-remsim-latest' container .. Add 'osmo-remsim-latest' container Change-Id: If16d4038a3c9a0532ae3a59762c68e40c18a9236 --- A osmo-remsim-latest/.release A osmo-remsim-latest/Dockerfile A osmo-remsim-latest/Makefile A osmo-remsim-latest/Release.key 4 files changed, 62 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/osmo-remsim-latest/.release b/osmo-remsim-latest/.release new file mode 100644 index 000..24401d3 --- /dev/null +++ b/osmo-remsim-latest/.release @@ -0,0 +1 @@ +release=0.0.0 diff --git a/osmo-remsim-latest/Dockerfile b/osmo-remsim-latest/Dockerfile new file mode 100644 index 000..a39aadb --- /dev/null +++ b/osmo-remsim-latest/Dockerfile @@ -0,0 +1,38 @@ +FROM debian:stretch + +MAINTAINER Harald Welte + +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/; + +COPY Release.key /tmp/Release.key + +ADD$OSMOCOM_REPO/Release /tmp/Release +RUNapt-get update && \ + apt-get install -y --no-install-recommends \ + gnupg + +RUNapt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list + +ADD$OSMOCOM_REPO/Release /tmp/Release +RUNapt-get update && \ + apt-get install -y --no-install-recommends \ + telnet \ + osmo-remsim-server \ + osmo-remsim-client \ + osmo-remsim-bankd && \ + apt-get clean + +#ADD respawn.sh /usr/local/bin/respawn.sh + +WORKDIR/tmp + +VOLUME /data + +#COPY osmo-bts.cfg /data/osmo-bts.cfg + +WORKDIR/data +CMD["/usr/bin/osmo-resmim-server"] + +#EXPOSE diff --git a/osmo-remsim-latest/Makefile b/osmo-remsim-latest/Makefile new file mode 100644 index 000..2e0e850 --- /dev/null +++ b/osmo-remsim-latest/Makefile @@ -0,0 +1,3 @@ +#RUN_ARGS?=--rm --network sigtran --ip 172.18.0.210 -v bts-vol:/data + +include ../make/Makefile diff --git a/osmo-remsim-latest/Release.key b/osmo-remsim-latest/Release.key new file mode 100644 index 000..e656238 --- /dev/null +++ b/osmo-remsim-latest/Release.key @@ -0,0 +1,20 @@ +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc +a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl +CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 +5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee +S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y +CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCWmMc +aQIbAwUJDEAUbQYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fjsoI +ALSXmXzFCpTxg8a6tvXkqddY/qAmeBMNUf7hslI9wN3leNmCrnuHS8TbHWYJZgtw +8M5fKL3aRQYaIiqqm1XOUF0OqwYNDj5V3y38mM68NYOkzgSP7foMwZp9Y0TlGhtI +L8weA+2RUjB4hwwGMAYMqkRZyKW3NhPqdlGGoXac1ilwEyGXFHdOLbkhtyS+P2yb +/EvaKIN5cMLzRZKeYgdp9WuAirV+yV/SDbgvabW098lrWhGLltlRRDQgMV883p8I +ERMI1wlLFZGnHL3mfBWGeQ24M/DaBOdXQDtfBLCJ9nGztmDBUb8i6GFWU7nD2TGi +8mYUsED1ZDwO/0jdvJ4gSluIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= +=Gvly +-END PGP PUBLIC KEY BLOCK- -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15512 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If16d4038a3c9a0532ae3a59762c68e40c18a9236 Gerrit-Change-Number: 15512 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in ...docker-playground[master]: Add 'osmo-remsim-latest' container
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/15512 Change subject: Add 'osmo-remsim-latest' container .. Add 'osmo-remsim-latest' container Change-Id: If16d4038a3c9a0532ae3a59762c68e40c18a9236 --- A osmo-remsim-latest/.release A osmo-remsim-latest/Dockerfile A osmo-remsim-latest/Makefile A osmo-remsim-latest/Release.key 4 files changed, 62 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/12/15512/1 diff --git a/osmo-remsim-latest/.release b/osmo-remsim-latest/.release new file mode 100644 index 000..24401d3 --- /dev/null +++ b/osmo-remsim-latest/.release @@ -0,0 +1 @@ +release=0.0.0 diff --git a/osmo-remsim-latest/Dockerfile b/osmo-remsim-latest/Dockerfile new file mode 100644 index 000..a39aadb --- /dev/null +++ b/osmo-remsim-latest/Dockerfile @@ -0,0 +1,38 @@ +FROM debian:stretch + +MAINTAINER Harald Welte + +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/; + +COPY Release.key /tmp/Release.key + +ADD$OSMOCOM_REPO/Release /tmp/Release +RUNapt-get update && \ + apt-get install -y --no-install-recommends \ + gnupg + +RUNapt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list + +ADD$OSMOCOM_REPO/Release /tmp/Release +RUNapt-get update && \ + apt-get install -y --no-install-recommends \ + telnet \ + osmo-remsim-server \ + osmo-remsim-client \ + osmo-remsim-bankd && \ + apt-get clean + +#ADD respawn.sh /usr/local/bin/respawn.sh + +WORKDIR/tmp + +VOLUME /data + +#COPY osmo-bts.cfg /data/osmo-bts.cfg + +WORKDIR/data +CMD["/usr/bin/osmo-resmim-server"] + +#EXPOSE diff --git a/osmo-remsim-latest/Makefile b/osmo-remsim-latest/Makefile new file mode 100644 index 000..2e0e850 --- /dev/null +++ b/osmo-remsim-latest/Makefile @@ -0,0 +1,3 @@ +#RUN_ARGS?=--rm --network sigtran --ip 172.18.0.210 -v bts-vol:/data + +include ../make/Makefile diff --git a/osmo-remsim-latest/Release.key b/osmo-remsim-latest/Release.key new file mode 100644 index 000..e656238 --- /dev/null +++ b/osmo-remsim-latest/Release.key @@ -0,0 +1,20 @@ +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc +a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl +CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 +5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee +S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y +CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCWmMc +aQIbAwUJDEAUbQYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fjsoI +ALSXmXzFCpTxg8a6tvXkqddY/qAmeBMNUf7hslI9wN3leNmCrnuHS8TbHWYJZgtw +8M5fKL3aRQYaIiqqm1XOUF0OqwYNDj5V3y38mM68NYOkzgSP7foMwZp9Y0TlGhtI +L8weA+2RUjB4hwwGMAYMqkRZyKW3NhPqdlGGoXac1ilwEyGXFHdOLbkhtyS+P2yb +/EvaKIN5cMLzRZKeYgdp9WuAirV+yV/SDbgvabW098lrWhGLltlRRDQgMV883p8I +ERMI1wlLFZGnHL3mfBWGeQ24M/DaBOdXQDtfBLCJ9nGztmDBUb8i6GFWU7nD2TGi +8mYUsED1ZDwO/0jdvJ4gSluIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= +=Gvly +-END PGP PUBLIC KEY BLOCK- -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15512 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If16d4038a3c9a0532ae3a59762c68e40c18a9236 Gerrit-Change-Number: 15512 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange
Change in ...osmo-ttcn3-hacks[master]: Initial TTCN-3 test suite for osmo-remsim
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15509 ) Change subject: Initial TTCN-3 test suite for osmo-remsim .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15509 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: I00034d3a991f0f881cfd8ff0bfc4557113daf830 Gerrit-Change-Number: 15509 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 13 Sep 2019 11:45:44 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...docker-playground[master]: support for dockerized osmo-resmim testsuite
laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/docker-playground/+/15511 ) Change subject: support for dockerized osmo-resmim testsuite .. support for dockerized osmo-resmim testsuite Change-Id: I05090f408b04aae24c23978da831e9f844d723a3 --- A ttcn3-remsim-test/.release A ttcn3-remsim-test/Dockerfile A ttcn3-remsim-test/Makefile A ttcn3-remsim-test/REMSIM_Tests.cfg A ttcn3-remsim-test/bankd/REMSIM_Tests.cfg A ttcn3-remsim-test/bankd/bankd_pcsc_slots.csv A ttcn3-remsim-test/client/REMSIM_Tests.cfg A ttcn3-remsim-test/jenkins.sh 8 files changed, 182 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/ttcn3-remsim-test/.release b/ttcn3-remsim-test/.release new file mode 100644 index 000..a036e4f --- /dev/null +++ b/ttcn3-remsim-test/.release @@ -0,0 +1,2 @@ +release=0.0.0 +tag=ttcn3-remsim-test-0.0.0 diff --git a/ttcn3-remsim-test/Dockerfile b/ttcn3-remsim-test/Dockerfile new file mode 100644 index 000..b1ea71f --- /dev/null +++ b/ttcn3-remsim-test/Dockerfile @@ -0,0 +1,35 @@ +ARGUSER +FROM $USER/debian-stretch-titan + +RUNmkdir /root/projects && (cd /root/projects && ln -sf / git) +RUNgit clone git://git.osmocom.org/osmo-ttcn3-hacks.git + +RUNcd osmo-ttcn3-hacks && \ + git checkout -f -B master origin/master && \ + make deps + +RUNgit config --global user.email doc...@dock.er && \ + git config --global user.name "Dock Er" + +ARGOSMO_TTCN3_BRANCH="master" + +ADDhttp://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +RUNcd osmo-ttcn3-hacks && \ + git fetch && \ + git checkout $OSMO_TTCN3_BRANCH && \ + (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ + git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ + make deps-update remsim + +VOLUME /data + +RUNln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ + ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / + +COPY REMSIM_Tests.cfg /data/REMSIM_Tests.cfg + +CMDcd /data && \ + /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/remsim/REMSIM_Tests; \ + exit_code=$?; \ + /osmo-ttcn3-hacks/log_merge.sh REMSIM_Tests --rm; \ + exit $exit_code diff --git a/ttcn3-remsim-test/Makefile b/ttcn3-remsim-test/Makefile new file mode 100644 index 000..0895788 --- /dev/null +++ b/ttcn3-remsim-test/Makefile @@ -0,0 +1,2 @@ + +include ../make/Makefile diff --git a/ttcn3-remsim-test/REMSIM_Tests.cfg b/ttcn3-remsim-test/REMSIM_Tests.cfg new file mode 100644 index 000..5a9f026 --- /dev/null +++ b/ttcn3-remsim-test/REMSIM_Tests.cfg @@ -0,0 +1,16 @@ +[ORDERED_INCLUDE] +"/osmo-ttcn3-hacks/Common.cfg" +"/osmo-ttcn3-hacks/remsim/REMSIM_Tests.default" + +[LOGGING] + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] +# IP address of IUT (server) to which test connects +REMSIM_Tests.mp_server_ip := "172.18.17.20" + +[MAIN_CONTROLLER] + +[EXECUTE] +RemsimServer_Tests.control diff --git a/ttcn3-remsim-test/bankd/REMSIM_Tests.cfg b/ttcn3-remsim-test/bankd/REMSIM_Tests.cfg new file mode 100644 index 000..2e77590 --- /dev/null +++ b/ttcn3-remsim-test/bankd/REMSIM_Tests.cfg @@ -0,0 +1,18 @@ +[ORDERED_INCLUDE] +"/osmo-ttcn3-hacks/Common.cfg" +"/osmo-ttcn3-hacks/remsim/REMSIM_Tests.default" + +[LOGGING] + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] +# IP address on which the simulated server binds +REMSIM_Tests.mp_server_ip := "172.18.17.10" +# IP address of the IUT (bankd) to which simulated client connects +REMSIM_Tests.mp_bankd_ip := "172.18.17.30" + +[MAIN_CONTROLLER] + +[EXECUTE] +RemsimBankd_Tests.control diff --git a/ttcn3-remsim-test/bankd/bankd_pcsc_slots.csv b/ttcn3-remsim-test/bankd/bankd_pcsc_slots.csv new file mode 100644 index 000..38a22c9 --- /dev/null +++ b/ttcn3-remsim-test/bankd/bankd_pcsc_slots.csv @@ -0,0 +1,6 @@ +"1","0","ACS ACR33 ICC Reader 00 00" +"1","1","ACS ACR33 ICC Reader 00 01" +"1","2","ACS ACR33 ICC Reader 00 02" +"1","3","ACS ACR33 ICC Reader 00 03" +"1","4","ACS ACR33 ICC Reader 00 04" +"1","23","Alcor Micro AU9560 00 00" diff --git a/ttcn3-remsim-test/client/REMSIM_Tests.cfg b/ttcn3-remsim-test/client/REMSIM_Tests.cfg new file mode 100644 index 000..d3f8d42 --- /dev/null +++ b/ttcn3-remsim-test/client/REMSIM_Tests.cfg @@ -0,0 +1,18 @@ +[ORDERED_INCLUDE] +"/osmo-ttcn3-hacks/Common.cfg" +"/osmo-ttcn3-hacks/remsim/REMSIM_Tests.default" + +[LOGGING] + +[TESTPORT_PARAMETERS] +# IP address to which ATS binds emulated remsim-server +REMSIM_Tests.mp_server_ip := "172.18.17.10" +# IP address to which ATS binds emulated remsim-bankd +REMSIM_Tests.mp_bankd_ip := "172.18.17.10" + +[MODULE_PARAMETERS] + +[MAIN_CONTROLLER] + +[EXECUTE] +RemsimClient_Tests.control diff --git a/ttcn3-remsim-test/jenkins.sh b/ttcn3-remsim-test/jenkins.sh new file mode 100755 index 000..38da9b3 --- /dev/null +++
Change in ...docker-playground[master]: support for dockerized osmo-resmim testsuite
laforge has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/docker-playground/+/15511 ) Change subject: support for dockerized osmo-resmim testsuite .. support for dockerized osmo-resmim testsuite Change-Id: I05090f408b04aae24c23978da831e9f844d723a3 --- A ttcn3-remsim-test/.release A ttcn3-remsim-test/Dockerfile A ttcn3-remsim-test/Makefile A ttcn3-remsim-test/REMSIM_Tests.cfg A ttcn3-remsim-test/bankd/REMSIM_Tests.cfg A ttcn3-remsim-test/bankd/bankd_pcsc_slots.csv A ttcn3-remsim-test/client/REMSIM_Tests.cfg A ttcn3-remsim-test/jenkins.sh 8 files changed, 182 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/11/15511/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15511 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I05090f408b04aae24c23978da831e9f844d723a3 Gerrit-Change-Number: 15511 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-MessageType: newpatchset
Change in ...docker-playground[master]: add osmo-resmsim-master Docker container
laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/docker-playground/+/15508 ) Change subject: add osmo-resmsim-master Docker container .. add osmo-resmsim-master Docker container this will be used in upcoming TTCN-3 tests for osmo-remsim Change-Id: I8508441289455d0a2e3486a99ef09c85937de26f --- A osmo-remsim-master/.release A osmo-remsim-master/Dockerfile A osmo-remsim-master/Makefile A osmo-remsim-master/Release.key 4 files changed, 77 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/osmo-remsim-master/.release b/osmo-remsim-master/.release new file mode 100644 index 000..24401d3 --- /dev/null +++ b/osmo-remsim-master/.release @@ -0,0 +1 @@ +release=0.0.0 diff --git a/osmo-remsim-master/Dockerfile b/osmo-remsim-master/Dockerfile new file mode 100644 index 000..acc7078 --- /dev/null +++ b/osmo-remsim-master/Dockerfile @@ -0,0 +1,53 @@ +ARGUSER +FROM $USER/debian-stretch-build + +MAINTAINER Harald Welte + +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/; + +COPY Release.key /tmp/Release.key + +RUNapt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list + +ADD$OSMOCOM_REPO/Release /tmp/Release +RUNapt-get update && \ + apt-get install -y --no-install-recommends \ + telnet \ + libosmocore-dev \ + libosmo-abis-dev \ + libosmo-netif-dev \ + libpcsclite-dev \ + libcsv-dev \ + libjansson-dev \ + libulfius-dev \ + liborcania-dev && \ + apt-get clean + +#ADD respawn.sh /usr/local/bin/respawn.sh + +WORKDIR/tmp + +ARGOSMO_REMSIM_BRANCH="master" + +RUNgit clone git://git.osmocom.org/osmo-remsim.git +ADDhttp://git.osmocom.org/osmo-remsim/patch?h=$OSMO_REMSIM_BRANCH /tmp/commit-osmo-remsim + +RUNcd osmo-remsim && \ + git fetch && git checkout $OSMO_REMSIM_BRANCH && \ + (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_REMSIM_BRANCH || exit 1); \ + git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ + autoreconf -fi && \ + ./configure && \ + make -j8 install && \ + ldconfig + +VOLUME /data + +#COPY osmo-bts.cfg /data/osmo-bts.cfg + +WORKDIR/data +CMD["/usr/local/bin/osmo-resmim-server"] + +#EXPOSE diff --git a/osmo-remsim-master/Makefile b/osmo-remsim-master/Makefile new file mode 100644 index 000..2e0e850 --- /dev/null +++ b/osmo-remsim-master/Makefile @@ -0,0 +1,3 @@ +#RUN_ARGS?=--rm --network sigtran --ip 172.18.0.210 -v bts-vol:/data + +include ../make/Makefile diff --git a/osmo-remsim-master/Release.key b/osmo-remsim-master/Release.key new file mode 100644 index 000..e656238 --- /dev/null +++ b/osmo-remsim-master/Release.key @@ -0,0 +1,20 @@ +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc +a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl +CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 +5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee +S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y +CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCWmMc +aQIbAwUJDEAUbQYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fjsoI +ALSXmXzFCpTxg8a6tvXkqddY/qAmeBMNUf7hslI9wN3leNmCrnuHS8TbHWYJZgtw +8M5fKL3aRQYaIiqqm1XOUF0OqwYNDj5V3y38mM68NYOkzgSP7foMwZp9Y0TlGhtI +L8weA+2RUjB4hwwGMAYMqkRZyKW3NhPqdlGGoXac1ilwEyGXFHdOLbkhtyS+P2yb +/EvaKIN5cMLzRZKeYgdp9WuAirV+yV/SDbgvabW098lrWhGLltlRRDQgMV883p8I +ERMI1wlLFZGnHL3mfBWGeQ24M/DaBOdXQDtfBLCJ9nGztmDBUb8i6GFWU7nD2TGi +8mYUsED1ZDwO/0jdvJ4gSluIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= +=Gvly +-END PGP PUBLIC KEY BLOCK- -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15508 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I8508441289455d0a2e3486a99ef09c85937de26f Gerrit-Change-Number: 15508 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in ...docker-playground[master]: support for dockerized osmo-resmim testsuite
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/15511 ) Change subject: support for dockerized osmo-resmim testsuite .. Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15511 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I05090f408b04aae24c23978da831e9f844d723a3 Gerrit-Change-Number: 15511 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 13 Sep 2019 11:44:33 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...docker-playground[master]: add osmo-resmsim-master Docker container
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/15508 ) Change subject: add osmo-resmsim-master Docker container .. Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15508 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I8508441289455d0a2e3486a99ef09c85937de26f Gerrit-Change-Number: 15508 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 13 Sep 2019 11:44:37 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...docker-playground[master]: WIP: support for osmo-resmim testsuite
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/15511 Change subject: WIP: support for osmo-resmim testsuite .. WIP: support for osmo-resmim testsuite Change-Id: I05090f408b04aae24c23978da831e9f844d723a3 --- A ttcn3-remsim-test/.release A ttcn3-remsim-test/Dockerfile A ttcn3-remsim-test/Makefile A ttcn3-remsim-test/REMSIM_Tests.cfg A ttcn3-remsim-test/bankd/REMSIM_Tests.cfg A ttcn3-remsim-test/bankd/bankd_pcsc_slots.csv A ttcn3-remsim-test/client/REMSIM_Tests.cfg A ttcn3-remsim-test/jenkins.sh 8 files changed, 182 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/11/15511/1 diff --git a/ttcn3-remsim-test/.release b/ttcn3-remsim-test/.release new file mode 100644 index 000..a036e4f --- /dev/null +++ b/ttcn3-remsim-test/.release @@ -0,0 +1,2 @@ +release=0.0.0 +tag=ttcn3-remsim-test-0.0.0 diff --git a/ttcn3-remsim-test/Dockerfile b/ttcn3-remsim-test/Dockerfile new file mode 100644 index 000..b1ea71f --- /dev/null +++ b/ttcn3-remsim-test/Dockerfile @@ -0,0 +1,35 @@ +ARGUSER +FROM $USER/debian-stretch-titan + +RUNmkdir /root/projects && (cd /root/projects && ln -sf / git) +RUNgit clone git://git.osmocom.org/osmo-ttcn3-hacks.git + +RUNcd osmo-ttcn3-hacks && \ + git checkout -f -B master origin/master && \ + make deps + +RUNgit config --global user.email doc...@dock.er && \ + git config --global user.name "Dock Er" + +ARGOSMO_TTCN3_BRANCH="master" + +ADDhttp://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +RUNcd osmo-ttcn3-hacks && \ + git fetch && \ + git checkout $OSMO_TTCN3_BRANCH && \ + (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ + git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ + make deps-update remsim + +VOLUME /data + +RUNln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ + ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / + +COPY REMSIM_Tests.cfg /data/REMSIM_Tests.cfg + +CMDcd /data && \ + /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/remsim/REMSIM_Tests; \ + exit_code=$?; \ + /osmo-ttcn3-hacks/log_merge.sh REMSIM_Tests --rm; \ + exit $exit_code diff --git a/ttcn3-remsim-test/Makefile b/ttcn3-remsim-test/Makefile new file mode 100644 index 000..0895788 --- /dev/null +++ b/ttcn3-remsim-test/Makefile @@ -0,0 +1,2 @@ + +include ../make/Makefile diff --git a/ttcn3-remsim-test/REMSIM_Tests.cfg b/ttcn3-remsim-test/REMSIM_Tests.cfg new file mode 100644 index 000..5a9f026 --- /dev/null +++ b/ttcn3-remsim-test/REMSIM_Tests.cfg @@ -0,0 +1,16 @@ +[ORDERED_INCLUDE] +"/osmo-ttcn3-hacks/Common.cfg" +"/osmo-ttcn3-hacks/remsim/REMSIM_Tests.default" + +[LOGGING] + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] +# IP address of IUT (server) to which test connects +REMSIM_Tests.mp_server_ip := "172.18.17.20" + +[MAIN_CONTROLLER] + +[EXECUTE] +RemsimServer_Tests.control diff --git a/ttcn3-remsim-test/bankd/REMSIM_Tests.cfg b/ttcn3-remsim-test/bankd/REMSIM_Tests.cfg new file mode 100644 index 000..2e77590 --- /dev/null +++ b/ttcn3-remsim-test/bankd/REMSIM_Tests.cfg @@ -0,0 +1,18 @@ +[ORDERED_INCLUDE] +"/osmo-ttcn3-hacks/Common.cfg" +"/osmo-ttcn3-hacks/remsim/REMSIM_Tests.default" + +[LOGGING] + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] +# IP address on which the simulated server binds +REMSIM_Tests.mp_server_ip := "172.18.17.10" +# IP address of the IUT (bankd) to which simulated client connects +REMSIM_Tests.mp_bankd_ip := "172.18.17.30" + +[MAIN_CONTROLLER] + +[EXECUTE] +RemsimBankd_Tests.control diff --git a/ttcn3-remsim-test/bankd/bankd_pcsc_slots.csv b/ttcn3-remsim-test/bankd/bankd_pcsc_slots.csv new file mode 100644 index 000..38a22c9 --- /dev/null +++ b/ttcn3-remsim-test/bankd/bankd_pcsc_slots.csv @@ -0,0 +1,6 @@ +"1","0","ACS ACR33 ICC Reader 00 00" +"1","1","ACS ACR33 ICC Reader 00 01" +"1","2","ACS ACR33 ICC Reader 00 02" +"1","3","ACS ACR33 ICC Reader 00 03" +"1","4","ACS ACR33 ICC Reader 00 04" +"1","23","Alcor Micro AU9560 00 00" diff --git a/ttcn3-remsim-test/client/REMSIM_Tests.cfg b/ttcn3-remsim-test/client/REMSIM_Tests.cfg new file mode 100644 index 000..d3f8d42 --- /dev/null +++ b/ttcn3-remsim-test/client/REMSIM_Tests.cfg @@ -0,0 +1,18 @@ +[ORDERED_INCLUDE] +"/osmo-ttcn3-hacks/Common.cfg" +"/osmo-ttcn3-hacks/remsim/REMSIM_Tests.default" + +[LOGGING] + +[TESTPORT_PARAMETERS] +# IP address to which ATS binds emulated remsim-server +REMSIM_Tests.mp_server_ip := "172.18.17.10" +# IP address to which ATS binds emulated remsim-bankd +REMSIM_Tests.mp_bankd_ip := "172.18.17.10" + +[MODULE_PARAMETERS] + +[MAIN_CONTROLLER] + +[EXECUTE] +RemsimClient_Tests.control diff --git a/ttcn3-remsim-test/jenkins.sh b/ttcn3-remsim-test/jenkins.sh new file mode 100755 index 000..38da9b3 --- /dev/null +++
Change in ...osmo-pcu[master]: bts.cpp: Fix osmo_tdef initialization on older g++ compilers
pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15510 ) Change subject: bts.cpp: Fix osmo_tdef initialization on older g++ compilers .. bts.cpp: Fix osmo_tdef initialization on older g++ compilers Fixing errrors spotted: bts.cpp:78:1: error: uninitialized const member 'osmo_tdef::T' }; ^ bts.cpp:78:1: error: uninitialized const member 'osmo_tdef::default_val' bts.cpp:78:1: error: uninitialized const member 'osmo_tdef::unit' bts.cpp:84:1: error: uninitialized const member 'osmo_tdef::T' }; ^ bts.cpp:84:1: error: uninitialized const member 'osmo_tdef::default_val' bts.cpp:84:1: error: uninitialized const member 'osmo_tdef::unit' Change-Id: I2dfecf22516f52cc19e0a0442e70dbc4dbc61336 --- M src/bts.cpp 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/bts.cpp b/src/bts.cpp index a913ca0..8b32e2e 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -74,13 +74,13 @@ { .T=3191, .default_val=5, .unit=OSMO_TDEF_S, .desc="Reuse of TFI(s) after sending (1) last RLC Data Block on TBF(s), or (2) PACKET TBF RELEASE for an MBMS radio bearer (s)", .val=0 }, { .T=3193, .default_val=100, .unit=OSMO_TDEF_MS, .desc="Reuse of TFI(s) after reception of final PACKET DOWNLINK ACK/NACK from MS for TBF (ms)", .val=0 }, { .T=3195, .default_val=5, .unit=OSMO_TDEF_S, .desc="Reuse of TFI(s) upon no response from the MS (radio failure or cell change) for TBF/MBMS radio bearer (s)", .val=0 }, - {} + { .T=0, .default_val=0, .unit=OSMO_TDEF_S, .desc=NULL, .val=0 } /* empty item at the end */ }; static struct osmo_tdef T_defs_pcu[] = { { .T=-2000, .default_val=2, .unit=OSMO_TDEF_MS, .desc="Tbf reject for PRR timer (ms)",.val=0 }, { .T=-2001, .default_val=2, .unit=OSMO_TDEF_S, .desc="PACCH assignment timer (s)", .val=0 }, { .T=-2002, .default_val=200, .unit=OSMO_TDEF_MS, .desc="Waiting after IMM.ASS confirm timer (ms)", .val=0 }, - {} + { .T=0, .default_val=0, .unit=OSMO_TDEF_S, .desc=NULL, .val=0 } /* empty item at the end */ }; /** -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15510 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2dfecf22516f52cc19e0a0442e70dbc4dbc61336 Gerrit-Change-Number: 15510 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 445s] ar: `u' modifier ignored since `D' is the default (see `U') [ 445s] libtool: link: ranlib .libs/libtransceiver_common.a [ 445s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 445s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 446s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 446s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 446s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 446s] collect2: error: ld returned 1 exit status [ 446s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 446s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 446s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 446s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 446s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 446s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 446s] make[1]: *** [Makefile:444: all] Error 2 [ 446s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 446s] dh_auto_build: make -j1 returned exit code 2 [ 446s] make: *** [debian/rules:6: build] Error 255 [ 446s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 446s] [ 446s] lamb08 failed "build osmo-trx_1.1.1.dsc" at Fri Sep 13 11:15:28 UTC 2019. [ 446s] [ 446s] ### VM INTERACTION START ### [ 449s] [ 429.470860] sysrq: SysRq : Power Off [ 449s] [ 429.476839] reboot: Power down [ 449s] ### VM INTERACTION END ### [ 449s] [ 449s] lamb08 failed "build osmo-trx_1.1.1.dsc" at Fri Sep 13 11:15:31 UTC 2019. [ 449s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 422s] ar: `u' modifier ignored since `D' is the default (see `U') [ 422s] libtool: link: ranlib .libs/libtransceiver_common.a [ 422s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 422s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 423s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 423s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 423s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 423s] collect2: error: ld returned 1 exit status [ 423s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 423s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 423s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 423s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 423s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 423s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 423s] make[1]: *** [Makefile:444: all] Error 2 [ 423s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 423s] dh_auto_build: make -j1 returned exit code 2 [ 423s] make: *** [debian/rules:6: build] Error 255 [ 423s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 423s] [ 423s] lamb03 failed "build osmo-trx_1.1.1.13.94c5.dsc" at Fri Sep 13 11:15:04 UTC 2019. [ 423s] [ 423s] ### VM INTERACTION START ### [ 426s] [ 406.796880] sysrq: SysRq : Power Off [ 426s] [ 406.805275] reboot: Power down [ 426s] ### VM INTERACTION END ### [ 426s] [ 426s] lamb03 failed "build osmo-trx_1.1.1.13.94c5.dsc" at Fri Sep 13 11:15:07 UTC 2019. [ 426s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Change in ...osmo-pcu[master]: bts.cpp: Fix osmo_tdef initialization on older g++ compilers
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15510 ) Change subject: bts.cpp: Fix osmo_tdef initialization on older g++ compilers .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15510 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2dfecf22516f52cc19e0a0442e70dbc4dbc61336 Gerrit-Change-Number: 15510 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: osmith Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 13 Sep 2019 11:14:36 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...docker-playground[master]: add osmo-resmsim-master Docker container
laforge has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/docker-playground/+/15508 ) Change subject: add osmo-resmsim-master Docker container .. add osmo-resmsim-master Docker container this will be used in upcoming TTCN-3 tests for osmo-remsim Change-Id: I8508441289455d0a2e3486a99ef09c85937de26f --- A osmo-remsim-master/.release A osmo-remsim-master/Dockerfile A osmo-remsim-master/Makefile A osmo-remsim-master/Release.key 4 files changed, 77 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/08/15508/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15508 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I8508441289455d0a2e3486a99ef09c85937de26f Gerrit-Change-Number: 15508 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-MessageType: newpatchset
Change in ...osmo-pcu[master]: bts.cpp: Fix osmo_tdef initialization on older g++ compilers
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15510 Change subject: bts.cpp: Fix osmo_tdef initialization on older g++ compilers .. bts.cpp: Fix osmo_tdef initialization on older g++ compilers Fixing errrors spotted: bts.cpp:78:1: error: uninitialized const member 'osmo_tdef::T' }; ^ bts.cpp:78:1: error: uninitialized const member 'osmo_tdef::default_val' bts.cpp:78:1: error: uninitialized const member 'osmo_tdef::unit' bts.cpp:84:1: error: uninitialized const member 'osmo_tdef::T' }; ^ bts.cpp:84:1: error: uninitialized const member 'osmo_tdef::default_val' bts.cpp:84:1: error: uninitialized const member 'osmo_tdef::unit' Change-Id: I2dfecf22516f52cc19e0a0442e70dbc4dbc61336 --- M src/bts.cpp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/10/15510/1 diff --git a/src/bts.cpp b/src/bts.cpp index a913ca0..8b32e2e 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -74,13 +74,13 @@ { .T=3191, .default_val=5, .unit=OSMO_TDEF_S, .desc="Reuse of TFI(s) after sending (1) last RLC Data Block on TBF(s), or (2) PACKET TBF RELEASE for an MBMS radio bearer (s)", .val=0 }, { .T=3193, .default_val=100, .unit=OSMO_TDEF_MS, .desc="Reuse of TFI(s) after reception of final PACKET DOWNLINK ACK/NACK from MS for TBF (ms)", .val=0 }, { .T=3195, .default_val=5, .unit=OSMO_TDEF_S, .desc="Reuse of TFI(s) upon no response from the MS (radio failure or cell change) for TBF/MBMS radio bearer (s)", .val=0 }, - {} + { .T=0, .default_val=0, .unit=OSMO_TDEF_S, .desc=NULL, .val=0 } /* empty item at the end */ }; static struct osmo_tdef T_defs_pcu[] = { { .T=-2000, .default_val=2, .unit=OSMO_TDEF_MS, .desc="Tbf reject for PRR timer (ms)",.val=0 }, { .T=-2001, .default_val=2, .unit=OSMO_TDEF_S, .desc="PACCH assignment timer (s)", .val=0 }, { .T=-2002, .default_val=200, .unit=OSMO_TDEF_MS, .desc="Waiting after IMM.ASS confirm timer (ms)", .val=0 }, - {} + { .T=0, .default_val=0, .unit=OSMO_TDEF_S, .desc=NULL, .val=0 } /* empty item at the end */ }; /** -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15510 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2dfecf22516f52cc19e0a0442e70dbc4dbc61336 Gerrit-Change-Number: 15510 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...osmo-trx[master]: Transceiver: Don't stop TRX if pulling from OFF timeslot
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15436 ) Change subject: Transceiver: Don't stop TRX if pulling from OFF timeslot .. Patch Set 2: Code-Review+2 Merging since it fixes important race condition stopping osmo-trx from start, and it was already reviewed by fixeria. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15436 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Icf62e5d1200c7a440f255bb46023cdbf61532b7f Gerrit-Change-Number: 15436 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 13 Sep 2019 10:32:53 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-trx[master]: Transceiver: pullRadioVector(): Fix use of uninitialized value bi->tn
pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-trx/+/15450 ) Change subject: Transceiver: pullRadioVector(): Fix use of uninitialized value bi->tn .. Transceiver: pullRadioVector(): Fix use of uninitialized value bi->tn Change-Id: Ia0f2b5a51040663d7e8219e6ed51e0513b876548 --- M Transceiver52M/Transceiver.cpp 1 file changed, 13 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 079d1d7..3901997 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -612,19 +612,6 @@ burstTime = radio_burst->getTime(); CorrType type = expectedCorrType(burstTime, chan); - /* Debug: dump bursts to disk */ - /* bits 0-7 - chan 0 timeslots - * bits 8-15 - chan 1 timeslots */ - if (mWriteBurstToDiskMask & ((1nbits = 0; bi->fn = burstTime.FN(); @@ -638,6 +625,19 @@ bi->tsc = 0; bi->ci = 0.0; + /* Debug: dump bursts to disk */ + /* bits 0-7 - chan 0 timeslots + * bits 8-15 - chan 1 timeslots */ + if (mWriteBurstToDiskMask & ((1 chans(); i++) { float pow = energyDetect(*radio_burst->getVector(i), 20 * mSPSRx); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15450 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia0f2b5a51040663d7e8219e6ed51e0513b876548 Gerrit-Change-Number: 15450 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in ...osmo-trx[master]: Transceiver: Don't stop TRX if pulling from OFF timeslot
pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-trx/+/15436 ) Change subject: Transceiver: Don't stop TRX if pulling from OFF timeslot .. Transceiver: Don't stop TRX if pulling from OFF timeslot BTS may have any timeslot disabled, or may have not yet sent initial SETSLOT cmd to properly configure the timeslot. Change-Id: Icf62e5d1200c7a440f255bb46023cdbf61532b7f --- M Transceiver52M/Transceiver.cpp M Transceiver52M/Transceiver.h 2 files changed, 17 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 3901997..2f4018c 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -587,9 +587,11 @@ /* * Pull bursts from the FIFO and handle according to the slot * and burst correlation type. Equalzation is currently disabled. - * returns true on success (bi filled), false on error (bi content undefined). + * returns 0 on success (bi filled), negative on error (bi content undefined): + *-ENOENT: timeslot is off (fn and tn in bi are filled), + *-EIO: read error */ -bool Transceiver::pullRadioVector(size_t chan, struct trx_ul_burst_ind *bi) +int Transceiver::pullRadioVector(size_t chan, struct trx_ul_burst_ind *bi) { int rc; struct estim_burst_params ebp; @@ -605,7 +607,7 @@ radioVector *radio_burst = mReceiveFIFO[chan]->read(); if (!radio_burst) { LOGCHAN(chan, DMAIN, ERROR) << "ReceiveFIFO->read() returned no burst"; -return false; +return -EIO; } /* Set time and determine correlation type */ @@ -635,7 +637,7 @@ * Not even power level or noise calculation. */ if (type == OFF) { delete radio_burst; -return false; +return -ENOENT; } /* Select the diversity channel with highest energy */ @@ -702,12 +704,12 @@ delete rxBurst; delete radio_burst; - return true; + return 0; ret_idle: bi->idle = true; delete radio_burst; - return true; + return 0; } void Transceiver::reset() @@ -1032,9 +1034,15 @@ bool Transceiver::driveReceiveFIFO(size_t chan) { struct trx_ul_burst_ind bi; + int rc; - if (!pullRadioVector(chan, )) -return false; + if ((rc = pullRadioVector(chan, )) < 0) { +if (rc == -ENOENT) { /* timeslot off, continue processing */ + LOGCHAN(chan, DMAIN, DEBUG) << unsigned(bi.tn) << ":" << bi.fn << " timeslot is off"; + return true; +} +return false; /* other errors: we want to stop the process */ + } if (!bi.idle) logRxBurst(chan, ); diff --git a/Transceiver52M/Transceiver.h b/Transceiver52M/Transceiver.h index 0d09854..30f6a60 100644 --- a/Transceiver52M/Transceiver.h +++ b/Transceiver52M/Transceiver.h @@ -182,7 +182,7 @@ void pushRadioVector(GSM::Time ); /** Pull and demodulate a burst from the receive FIFO */ - bool pullRadioVector(size_t chan, struct trx_ul_burst_ind *ind); + int pullRadioVector(size_t chan, struct trx_ul_burst_ind *ind); /** Set modulus for specific timeslot */ void setModulus(size_t timeslot, size_t chan); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15436 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Icf62e5d1200c7a440f255bb46023cdbf61532b7f Gerrit-Change-Number: 15436 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in ...osmo-trx[master]: Transceiver: pullRadioVector(): Fix use of uninitialized value bi->tn
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15450 ) Change subject: Transceiver: pullRadioVector(): Fix use of uninitialized value bi->tn .. Patch Set 1: Code-Review+2 Merging since it fixes important race condition stopping osmo-trx from start, and it was already reviewed by fixeria. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15450 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia0f2b5a51040663d7e8219e6ed51e0513b876548 Gerrit-Change-Number: 15450 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 13 Sep 2019 10:32:48 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...pysim[master]: cards: use string representation for MNC/MCC
Hello daniel, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/15496 to look at the new patch set (#3). Change subject: cards: use string representation for MNC/MCC .. cards: use string representation for MNC/MCC At the moment MNC and MCC are represented as integer numbers inside the parameter array while all other parameters are represented as strings. Lets use strings for MNC/MCC as well to simplify the parameter handling. We will also not loose the length information in case of leading zeros. Change-Id: Ia2333921a4863f0f26ee923ca796e62ec5e2d59a --- M pySim-prog.py M pySim/utils.py 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/96/15496/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/15496 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia2333921a4863f0f26ee923ca796e62ec5e2d59a Gerrit-Change-Number: 15496 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-MessageType: newpatchset
Change in ...pysim[master]: cards: use string representation for MNC/MCC
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/15496 ) Change subject: cards: use string representation for MNC/MCC .. Patch Set 2: > Patch Set 1: Code-Review-1 > > Don't you need to modify enc_plmn for that as well? > > pySim/utils.py line 101: > swap_nibbles(lpad('%d' % mcc, 3) + lpad('%d' % mnc, 3)) Thats probably the better solution. I have done that now. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/15496 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia2333921a4863f0f26ee923ca796e62ec5e2d59a Gerrit-Change-Number: 15496 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Comment-Date: Fri, 13 Sep 2019 09:07:43 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-pcu[master]: Forward ETWS Primary Notification to MS
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15459 ) Change subject: Forward ETWS Primary Notification to MS .. Patch Set 8: Rebased on master, ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15459 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ie35959f833f46bde5f2126314b6f96763f863b36 Gerrit-Change-Number: 15459 Gerrit-PatchSet: 8 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 13 Sep 2019 08:40:57 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...pysim[master]: pySim-prog: use case insensitive CSV headers.
Hello daniel, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/15498 to look at the new patch set (#2). Change subject: pySim-prog: use case insensitive CSV headers. .. pySim-prog: use case insensitive CSV headers. Inside of pySim all CSV headers are defined in lower case and are evaluated case sensitive. This means that a CSV file that contains the headers in uppercase for example will not parse. Lets make sure that the CSV headers are evaluated case insensitive to increase compatibility with slightly different formats. Change-Id: I1a476e7fc521d1aad2956feec3db196156961d20 --- M pySim-prog.py 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/98/15498/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/15498 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1a476e7fc521d1aad2956feec3db196156961d20 Gerrit-Change-Number: 15498 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset
Change in ...pysim[master]: pySim-prog: use functions to derive MCC/MNC from IMSI
Hello daniel, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/15497 to look at the new patch set (#2). Change subject: pySim-prog: use functions to derive MCC/MNC from IMSI .. pySim-prog: use functions to derive MCC/MNC from IMSI In case the MCC/MNC are not supplied with a CSV file we cut out the missing values from the IMSI string. Lets use a function to do this and also check the input parameters. Change-Id: I98e5bf8f9ff2a852efb190cc789edf42c5075bf8 --- M pySim-prog.py M pySim/utils.py 2 files changed, 31 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/97/15497/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/15497 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I98e5bf8f9ff2a852efb190cc789edf42c5075bf8 Gerrit-Change-Number: 15497 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-CC: laforge Gerrit-MessageType: newpatchset
Change in ...osmo-pcu[master]: Forward ETWS Primary Notification to MS
Hello pespin, fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/15459 to look at the new patch set (#8). Change subject: Forward ETWS Primary Notification to MS .. Forward ETWS Primary Notification to MS Receive an Application Information Request from the BTS via PCU interface. Construct a Packet Application Information message from it (3GPP TS 44.060 11.2.47) and send it to all MS with active TBF. The TTCN-3 test infrastructure to test this feature is not quite ready yet, so I've added C unit tests instead. Related: OS#4048 Change-Id: Ie35959f833f46bde5f2126314b6f96763f863b36 --- M include/osmocom/pcu/pcuif_proto.h M src/Makefile.am M src/bts.cpp M src/bts.h M src/gprs_ms.cpp M src/gprs_ms.h M src/gprs_rlcmac.cpp M src/gprs_rlcmac.h M src/gprs_rlcmac_sched.cpp M src/pcu_l1_if.cpp M tests/Makefile.am A tests/app_info/AppInfoTest.cpp A tests/app_info/AppInfoTest.err A tests/app_info/AppInfoTest.ok M tests/testsuite.at 15 files changed, 407 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/59/15459/8 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15459 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ie35959f833f46bde5f2126314b6f96763f863b36 Gerrit-Change-Number: 15459 Gerrit-PatchSet: 8 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-MessageType: newpatchset
Change in ...pysim[master]: pySim-prog: check if CSV file exists
Hello daniel, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/15495 to look at the new patch set (#2). Change subject: pySim-prog: check if CSV file exists .. pySim-prog: check if CSV file exists At the moment we do not chack if the CSV file exists at all. This may lead into a crash while programming the card. Lets check the CSV file before we start. Change-Id: I2643996282d88e512c17901ab0e1181677d5dd6c Related: SYS#4654 --- M pySim-prog.py 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/95/15495/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/15495 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I2643996282d88e512c17901ab0e1181677d5dd6c Gerrit-Change-Number: 15495 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-MessageType: newpatchset
Change in ...pysim[master]: Add support for automatic card handling
dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/pysim/+/15432 ) Change subject: Add support for automatic card handling .. Add support for automatic card handling When using the batch mode of pySim-prog, the user has to insert/remove the cards from the cardreader manually. This is fine for small batches, but for high volume batches this method is not applicable. This patch adds support for the integration of an automatic card handler machine. The user can freely configure a custom commandline that is executed when a card should be inserted or moved to a good/bad collection bin. Change-Id: Icfed3cad7927b92816723d75603b78e1a4b87ef1 Related: SYS#4654 --- M contrib/jenkins.sh M pySim-prog.py A pySim/card_handler.py 3 files changed, 213 insertions(+), 77 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index fdcd0cb..a70f139 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -12,6 +12,7 @@ virtualenv -p python2 venv --system-site-packages . venv/bin/activate pip install pytlv +pip install pyyaml cd pysim-testdata ../tests/pysim-test.sh diff --git a/pySim-prog.py b/pySim-prog.py index 13e8bb5..55634a5 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -30,6 +30,7 @@ import random import re import sys +import traceback try: import json @@ -41,6 +42,7 @@ from pySim.cards import _cards_classes from pySim.utils import h2b, swap_nibbles, rpad, derive_milenage_opc, calculate_luhn, dec_iccid from pySim.ts_51_011 import EF +from pySim.card_handler import * def parse_options(): @@ -163,6 +165,9 @@ help="Perform a 'dry run', don't actually program the card", default=False, action="store_true") + parser.add_option("--card_handler", dest="card_handler", metavar="FILE", + help="Use automatic card handling machine") + (options, args) = parser.parse_args() if options.type == 'list': @@ -610,6 +615,74 @@ return card +def process_card(opts, first, card_handler): + + if opts.dry_run is False: + # Connect transport + card_handler.get(first) + + if opts.dry_run is False: + # Get card + card = card_detect(opts, scc) + if card is None: + print "No card detected!" + return -1 + + # Probe only + if opts.probe: + return 0 + + # Erase if requested + if opts.erase: + print "Formatting ..." + card.erase() + card.reset() + + # Generate parameters + if opts.source == 'cmdline': + cp = gen_parameters(opts) + elif opts.source == 'csv': + imsi = None + iccid = None + if opts.read_iccid: + if opts.dry_run: + # Connect transport + card_handler.get(false) + (res,_) = scc.read_binary(['3f00', '2fe2'], length=10) + iccid = dec_iccid(res) + elif opts.read_imsi: + if opts.dry_run: + # Connect transport + card_handler.get(false) + (res,_) = scc.read_binary(EF['IMSI']) + imsi = swap_nibbles(res)[3:] + else: + imsi = opts.imsi + cp = read_params_csv(opts, imsi=imsi, iccid=iccid) + if cp is None: + print "Error reading parameters\n" + return 2 + print_parameters(cp) + + if opts.dry_run is False: + # Program the card + print "Programming ..." + card.program(cp) + else: + print "Dry Run: NOT PROGRAMMING!" + + # Write parameters permanently + write_parameters(opts, cp) + + # Batch mode state update and save + if opts.num is not None: + opts.num += 1 + save_batch(opts) + + card_handler.done() + return 0 + + if __name__ == '__main__': # Parse options @@ -638,88 +711,42 @@ # Batch mode init init_batch(opts) + if opts.card_handler: + card_handler = card_handler_auto(sl, opts.card_handler) +else: + card_handler = card_handler(sl) + # Iterate - done = False first = True card = None - while not done: + while 1: + try: + rc = process_card(opts, first, card_handler) + except (KeyboardInterrupt): +
Build failure of network:osmocom:nightly/osmo-trx in Debian_Testing/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 927s] ar: `u' modifier ignored since `D' is the default (see `U') [ 927s] libtool: link: ranlib .libs/libtransceiver_common.a [ 927s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 927s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 927s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 928s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 928s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 928s] collect2: error: ld returned 1 exit status [ 928s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 928s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 928s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 928s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 928s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 928s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 928s] make[1]: *** [Makefile:444: all] Error 2 [ 928s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 928s] dh_auto_build: make -j1 returned exit code 2 [ 928s] make: *** [debian/rules:6: build] Error 255 [ 928s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 928s] [ 928s] lamb52 failed "build osmo-trx_1.1.1.13.94c5.dsc" at Fri Sep 13 06:08:00 UTC 2019. [ 928s] [ 928s] ### VM INTERACTION START ### [ 931s] [ 881.178157] sysrq: SysRq : Power Off [ 931s] [ 881.194537] reboot: Power down [ 931s] ### VM INTERACTION END ### [ 931s] [ 931s] lamb52 failed "build osmo-trx_1.1.1.13.94c5.dsc" at Fri Sep 13 06:08:04 UTC 2019. [ 931s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:latest/osmo-trx in Debian_Testing/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 601s] ar: `u' modifier ignored since `D' is the default (see `U') [ 601s] libtool: link: ranlib .libs/libtransceiver_common.a [ 601s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 601s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 602s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 602s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 602s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 602s] collect2: error: ld returned 1 exit status [ 602s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 602s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 602s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 602s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 602s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 602s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 602s] make[1]: *** [Makefile:444: all] Error 2 [ 602s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 602s] dh_auto_build: make -j1 returned exit code 2 [ 602s] make: *** [debian/rules:6: build] Error 255 [ 602s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 602s] [ 602s] lamb13 failed "build osmo-trx_1.1.1.dsc" at Fri Sep 13 06:02:38 UTC 2019. [ 602s] [ 602s] ### VM INTERACTION START ### [ 605s] [ 584.847900] sysrq: SysRq : Power Off [ 605s] [ 584.852881] reboot: Power down [ 605s] ### VM INTERACTION END ### [ 605s] [ 605s] lamb13 failed "build osmo-trx_1.1.1.dsc" at Fri Sep 13 06:02:41 UTC 2019. [ 605s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 286s] ar: `u' modifier ignored since `D' is the default (see `U') [ 286s] libtool: link: ranlib .libs/libtransceiver_common.a [ 286s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 286s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 286s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 286s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 286s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 286s] collect2: error: ld returned 1 exit status [ 286s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 286s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 286s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 286s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 286s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 286s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 286s] make[1]: *** [Makefile:444: all] Error 2 [ 286s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 286s] dh_auto_build: make -j1 returned exit code 2 [ 286s] make: *** [debian/rules:6: build] Error 255 [ 286s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 286s] [ 286s] build76 failed "build osmo-trx_1.1.1.dsc" at Fri Sep 13 06:01:26 UTC 2019. [ 286s] [ 286s] ### VM INTERACTION START ### [ 290s] [ 277.159770] sysrq: SysRq : Power Off [ 290s] [ 277.161498] reboot: Power down [ 290s] ### VM INTERACTION END ### [ 290s] [ 290s] build76 failed "build osmo-trx_1.1.1.dsc" at Fri Sep 13 06:01:30 UTC 2019. [ 290s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)