diff --git a/README.txt b/README.txt index aec938c0d341e147599279c7c3a315d1aee63fd3..33c0df9d8dfe323fa9c367579d12727ae648b7a7 100644 --- a/README.txt +++ b/README.txt @@ -61,3 +61,4 @@ v1.0.0 -> January 2019. This version first implements the architectural split de S1-flex has been introduced. New tools: config library, telnet server, ... A lot of bugfixes and a proper automated Continuous Integration process validates contributions. +v1.0.1 -> February 2019: Bug fix for the UE L1 simulator. diff --git a/ci-scripts/runTestOnVM.sh b/ci-scripts/runTestOnVM.sh index 7ff04e23f89bdbab5583387a29a55cfc97c56810..208381a944e556a10deb05585d4ae4819a42c425 100755 --- a/ci-scripts/runTestOnVM.sh +++ b/ci-scripts/runTestOnVM.sh @@ -604,10 +604,34 @@ function start_l2_sim_ue { if [ $i -lt 50 ] then UE_SYNC=0 - echo "L2-SIM UE is NOT sync'ed w/eNB" + echo "L2-SIM UE is NOT sync'ed w/ eNB" + return else UE_SYNC=1 - echo "L2-SIM UE is sync'ed w/eNB" + echo "L2-SIM UE is sync'ed w/ eNB" + fi + # Checking oip1 interface has now an IP address + i="0" + echo "ifconfig oip1 | egrep -c \"inet addr\"" > $1 + while [ $i -lt 10 ] + do + sleep 5 + CONNECTED=`ssh -o StrictHostKeyChecking=no ubuntu@$LOC_VM_IP_ADDR < $1` + if [ $CONNECTED -eq 1 ] + then + i="100" + else + i=$[$i+1] + fi + done + rm $1 + if [ $i -lt 50 ] + then + UE_SYNC=0 + echo "L2-SIM UE oip1 is NOT sync'ed w/ EPC" + else + UE_SYNC=1 + echo "L2-SIM UE oip1 is sync'ed w/ EPC" fi sleep 10 } diff --git a/targets/RT/USER/lte-uesoftmodem.c b/targets/RT/USER/lte-uesoftmodem.c index a3aa0036628cdda51be0b0014de6fa5aedee89fa..13cc859414314ccc8d2162c2962c35111571bd3a 100644 --- a/targets/RT/USER/lte-uesoftmodem.c +++ b/targets/RT/USER/lte-uesoftmodem.c @@ -693,9 +693,13 @@ int main( int argc, char **argv ) { #if defined (XFORMS) int ret; #endif + configmodule_interface_t *config_mod; + start_background_system(); - if ( load_configmodule(argc,argv,CONFIG_ENABLECMDLINEONLY) == NULL) { + config_mod = load_configmodule(argc, argv, CONFIG_ENABLECMDLINEONLY); + + if (config_mod == NULL) { exit_fun("[SOFTMODEM] Error, configuration module init failed\n"); } @@ -811,8 +815,6 @@ int main( int argc, char **argv ) { } else init_openair0(frame_parms[0],(int)rx_gain[0][0]); if (simL1flag==1) { - AssertFatal(NULL!=load_configmodule(argc,argv,CONFIG_ENABLECMDLINEONLY), - "[SOFTMODEM] Error, configuration module init failed\n"); RCConfig_sim(); }