From 538be9155c9c6a4655aad69791bca621ee080a0c Mon Sep 17 00:00:00 2001
From: hardy <remi.hardy@openairinterface.org>
Date: Sun, 4 Oct 2020 21:34:30 +0200
Subject: [PATCH] finalized RFsim RA check test
---
ci-scripts/reportTestLocally.sh | 86 ++++++++++++++++++---------------
ci-scripts/runTestOnVM.sh | 16 +++---
2 files changed, 55 insertions(+), 47 deletions(-)
diff --git a/ci-scripts/reportTestLocally.sh b/ci-scripts/reportTestLocally.sh
index ed2f0ffe03f..8cdaf6e1ef6 100755
--- a/ci-scripts/reportTestLocally.sh
+++ b/ci-scripts/reportTestLocally.sh
@@ -766,52 +766,58 @@ function report_test {
fi
echo " </tr>" >> ./test_simulator_results.html
- #RA test
- #check formatting
+ #RA test (--do-ra option)
- echo " <tr>" >> ./test_simulator_results.html
- echo " <td>ENB LOG file --- UE LOG file </td>" >> ./test_simulator_results.html
- echo " <td>Check RA succeeded</td>" >> ./test_simulator_results.html
- echo " <td bgcolor = \"red\" >KO</td>" >> ./test_simulator_results.html
- echo " <td><pre>" >> ./test_simulator_results.html
- echo "<font color = \"red\">No check yet</font>" >> ./test_simulator_results.html
- echo " </pre></td>" >> ./test_simulator_results.html
- echo " </tr>" >> ./test_simulator_results.html
-
-
- #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 " <tr>" >> ./test_simulator_results.html
- # echo " <td>$NAME_ENB --- $NAME_UE</td>" >> ./test_simulator_results.html
- # echo " <td>N/A</td>" >> ./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 " <tr>" >> ./test_simulator_results.html
+ echo " <td>$NAME_ENB --- $NAME_UE</td>" >> ./test_simulator_results.html
+ echo " <td>Check if RA proc succeeded</td>" >> ./test_simulator_results.html
- # #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`
+ #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`
- # if [ $GNB_RECEIVED -gt 0 ] && [ $GNB_CONNECTED -gt 0 ] && [ $UE_RA_PROC_OK -gt 0 ]
- # then
- # echo " <td bgcolor = \"green\" >OK</td>" >> ./test_simulator_results.html
- # else
- # echo " <td bgcolor = \"red\" >KO</td>" >> ./test_simulator_results.html
- # fi
+ if [ $GNB_RECEIVED -gt 0 ] && [ $GNB_CONNECTED -gt 0 ] && [ $UE_RA_PROC_OK -gt 0 ]
+ then
+ echo " <td bgcolor = \"green\" >OK</td>" >> ./test_simulator_results.html
+ else
+ echo " <td bgcolor = \"red\" >KO</td>" >> ./test_simulator_results.html
+ fi
- # echo " </pre></td>" >> ./test_simulator_results.html
- # echo " </tr>" >> ./test_simulator_results.html
- #fi
+ echo " <td><pre>" >> ./test_simulator_results.html
+ if [ $GNB_RECEIVED -gt 0 ]
+ then
+ echo "<font color = \"blue\">- gNB --> RA received</font>" >> ./test_simulator_results.html
+ else
+ echo "<font color = \"red\"><b>- gNB RA NOT RECEIVED</b></font>" >> ./test_simulator_results.html
+ fi
+ if [ $GNB_CONNECTED -gt 0 ]
+ then
+ echo "<font color = \"blue\">- gNB --> 5G connected</font>" >> ./test_simulator_results.html
+ else
+ echo "<font color = \"red\"><b>- gNB NOT 5G CONNECTED</b></font>" >> ./test_simulator_results.html
+ fi
+ if [ $UE_RA_PROC_OK -gt 0 ]
+ then
+ echo "<font color = \"blue\">- NR UE --> RA procedure succeded</font>" >> ./test_simulator_results.html
+ else
+ echo "<font color = \"red\"><b>- NR UE RA procedure failed</b></font>" >> ./test_simulator_results.html
+ fi
+ echo " </pre></td>" >> ./test_simulator_results.html
+ echo " </tr>" >> ./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 2df10dbdf82..7f2ce6279dd 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
--
GitLab