diff --git a/ci-scripts/reportTestLocally.sh b/ci-scripts/reportTestLocally.sh
index ed2f0ffe03..8cdaf6e1ef 100755
--- a/ci-scripts/reportTestLocally.sh
+++ b/ci-scripts/reportTestLocally.sh
@@ -766,52 +766,58 @@ function report_test {
fi
echo " " >> ./test_simulator_results.html
- #RA test
- #check formatting
+ #RA test (--do-ra option)
- echo " " >> ./test_simulator_results.html
- echo " | ENB LOG file --- UE LOG file | " >> ./test_simulator_results.html
- echo " Check RA succeeded | " >> ./test_simulator_results.html
- echo " KO | " >> ./test_simulator_results.html
- echo " " >> ./test_simulator_results.html
- echo "No check yet" >> ./test_simulator_results.html
- echo " | " >> ./test_simulator_results.html
- echo "
" >> ./test_simulator_results.html
+ #build log files names
+ RA_ENB_LOG=$ARCHIVES_LOC/ra_check_${TMODE}_${BW}prb_${CN_CONFIG}_gnb.log
+ RA_UE_LOG=$ARCHIVES_LOC/ra_check_${TMODE}_${BW}prb_${CN_CONFIG}_ue.log
+ if [ -f $RA_ENB_LOG ] && [ -f $RA_UE_LOG ]
+ then
+ #get rid of full path
+ NAME_ENB=`echo $RA_ENB_LOG | sed -e "s#$ARCHIVES_LOC/##"`
+ NAME_UE=`echo $RA_UE_LOG | sed -e "s#$ARCHIVES_LOC/##"`
+ echo " " >> ./test_simulator_results.html
+ echo " | $NAME_ENB --- $NAME_UE | " >> ./test_simulator_results.html
+ echo " Check if RA proc succeeded | " >> ./test_simulator_results.html
+
+ #gNB RA check
+ GNB_RECEIVED=`egrep "received correctly" $RA_ENB_LOG`
+ GNB_CONNECTED=`egrep "now 5G connected" $RA_ENB_LOG`
+ #UE RA check
+ UE_RA_PROC_OK=`egrep "RA procedure succeeded" $RA_UE_LOG`
- #RH file names to be checked
- #RA_ENB_LOG=$ARCHIVES_LOC/RA_CHECK_${TMODE}_${BW}prb_${CN_CONFIG}_gnb.log
- #UE_LOG=`echo $ENB_LOG | sed -e "s#gnb#ue#"`
- #RA_UE_LOG=
-
- #if [ -f $ENB_LOG ] && [ -f $UE_LOG ]
- #then
- # #RH file names to be checked
- # NAME_ENB=`echo $ENB_LOG | sed -e "s#$ARCHIVES_LOC/##"`
- # NAME_UE=`echo $UE_LOG | sed -e "s#$ARCHIVES_LOC/##"`
- # echo "
" >> ./test_simulator_results.html
- # echo " | $NAME_ENB --- $NAME_UE | " >> ./test_simulator_results.html
- # echo " N/A | " >> ./test_simulator_results.html
+ if [ $GNB_RECEIVED -gt 0 ] && [ $GNB_CONNECTED -gt 0 ] && [ $UE_RA_PROC_OK -gt 0 ]
+ then
+ echo " OK | " >> ./test_simulator_results.html
+ else
+ echo " KO | " >> ./test_simulator_results.html
+ fi
- # #gNB RA check
- # GNB_RECEIVED=`egrep -c "received correctly" $RA_ENB_LOG`
- # GNB_CONNECTED=`egrep -c "now 5G connected" $RA_ENB_LOG`
- # #UE RA check
- # UE_RA_PROC_OK=`egrep -c "RA procedure succeeded" $RA_UE_LOG`
+ echo " " >> ./test_simulator_results.html
+ if [ $GNB_RECEIVED -gt 0 ]
+ then
+ echo "- gNB --> RA received" >> ./test_simulator_results.html
+ else
+ echo "- gNB RA NOT RECEIVED" >> ./test_simulator_results.html
+ fi
+ if [ $GNB_CONNECTED -gt 0 ]
+ then
+ echo "- gNB --> 5G connected" >> ./test_simulator_results.html
+ else
+ echo "- gNB NOT 5G CONNECTED" >> ./test_simulator_results.html
+ fi
+ if [ $UE_RA_PROC_OK -gt 0 ]
+ then
+ echo "- NR UE --> RA procedure succeded" >> ./test_simulator_results.html
+ else
+ echo "- NR UE RA procedure failed" >> ./test_simulator_results.html
+ fi
+ echo " | " >> ./test_simulator_results.html
+ echo "
" >> ./test_simulator_results.html
+ fi
-
- # if [ $GNB_RECEIVED -gt 0 ] && [ $GNB_CONNECTED -gt 0 ] && [ $UE_RA_PROC_OK -gt 0 ]
- # then
- # echo " OK | " >> ./test_simulator_results.html
- # else
- # echo " KO | " >> ./test_simulator_results.html
- # fi
-
- # echo " " >> ./test_simulator_results.html
- # echo " " >> ./test_simulator_results.html
- #fi
-
- #sync test
+ #SYNC test
ENB_LOG=$ARCHIVES_LOC/${TMODE}_${BW}prb_${CN_CONFIG}_gnb.log
UE_LOG=`echo $ENB_LOG | sed -e "s#gnb#ue#"`
if [ -f $ENB_LOG ] && [ -f $UE_LOG ]
diff --git a/ci-scripts/runTestOnVM.sh b/ci-scripts/runTestOnVM.sh
index 2df10dbdf8..7f2ce6279d 100755
--- a/ci-scripts/runTestOnVM.sh
+++ b/ci-scripts/runTestOnVM.sh
@@ -282,11 +282,13 @@ function check_ra_result {
local LOC_UE_LOG=$2
#gNB RA test
- echo "egrep -c \"received correctly\" $1"
- echo "egrep -c \"now 5G connected\" $1"
+ echo "Checking gNB Log for RA success"
+ egrep "received correctly" $1
+ egrep "now 5G connected" $1
#UE RA test
- echo "egrep -c \"RA procedure succeeded\" $2"
+ echo 'Checking UE Log for RA success'
+ egrep "RA procedure succeeded" $2
}
@@ -2213,14 +2215,14 @@ function run_test_on_vm {
- #check RA marker in gNB and NR UE log files
+ #check RA markers in gNB and NR UE log files
echo "############################################################"
echo "${CN_CONFIG} : Checking RA on gNB / NR-UE"
echo "############################################################"
- mv $ARCHIVES_LOC/$CURRENT_GNB_LOG_FILE $ARCHIVES_LOC/RA_CHECK_$CURRENT_GNB_LOG_FILE
- mv $ARCHIVES_LOC/$CURRENT_NR_UE_LOG_FILE $ARCHIVES_LOC/RA_CHECK_$CURRENT_NR_UE_LOG_FILE
- check_ra_result $ARCHIVES_LOC/RA_CHECK_$CURRENT_GNB_LOG_FILE $ARCHIVES_LOC/RA_CHECK_$CURRENT_NR_UE_LOG_FILE
+ mv $ARCHIVES_LOC/$CURRENT_GNB_LOG_FILE $ARCHIVES_LOC/ra_check_$CURRENT_GNB_LOG_FILE
+ mv $ARCHIVES_LOC/$CURRENT_NR_UE_LOG_FILE $ARCHIVES_LOC/ra_check_$CURRENT_NR_UE_LOG_FILE
+ check_ra_result $ARCHIVES_LOC/ra_check_$CURRENT_GNB_LOG_FILE $ARCHIVES_LOC/ra_check_$CURRENT_NR_UE_LOG_FILE
#end RA test