Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenXG
OpenXG UE
Commits
d0ab6456
Commit
d0ab6456
authored
Oct 17, 2020
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CI: proper disabling of 5g RF sim RA-TEST
Signed-off-by:
Raphael Defosseux
<
raphael.defosseux@eurecom.fr
>
parent
ef2a30bc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
67 additions
and
62 deletions
+67
-62
ci-scripts/reportTestLocally.sh
ci-scripts/reportTestLocally.sh
+49
-48
ci-scripts/runTestOnVM.sh
ci-scripts/runTestOnVM.sh
+18
-14
No files found.
ci-scripts/reportTestLocally.sh
View file @
d0ab6456
...
@@ -768,54 +768,55 @@ function report_test {
...
@@ -768,54 +768,55 @@ function report_test {
#RA test (--do-ra option)
#RA test (--do-ra option)
#build log files names
# Currently disabled
RA_ENB_LOG
=
$ARCHIVES_LOC
/ra_check_
${
TMODE
}
_
${
BW
}
prb_
${
CN_CONFIG
}
_gnb.log
# #build log files names
RA_UE_LOG
=
$ARCHIVES_LOC
/ra_check_
${
TMODE
}
_
${
BW
}
prb_
${
CN_CONFIG
}
_ue.log
# RA_ENB_LOG=$ARCHIVES_LOC/${TMODE}_${BW}prb_${CN_CONFIG}_gnb_ra_test.log
if
[
-f
$RA_ENB_LOG
]
&&
[
-f
$RA_UE_LOG
]
# RA_UE_LOG=$ARCHIVES_LOC/ra_check_${TMODE}_${BW}prb_${CN_CONFIG}_ue_ra_test.log
then
# if [ -f $RA_ENB_LOG ] && [ -f $RA_UE_LOG ]
#get rid of full path
# then
NAME_ENB
=
`
echo
$RA_ENB_LOG
|
sed
-e
"s#
$ARCHIVES_LOC
/##"
`
# #get rid of full path
NAME_UE
=
`
echo
$RA_UE_LOG
|
sed
-e
"s#
$ARCHIVES_LOC
/##"
`
# NAME_ENB=`echo $RA_ENB_LOG | sed -e "s#$ARCHIVES_LOC/##"`
echo
" <tr>"
>>
./test_simulator_results.html
# NAME_UE=`echo $RA_UE_LOG | sed -e "s#$ARCHIVES_LOC/##"`
echo
" <td>
$NAME_ENB
---
$NAME_UE
</td>"
>>
./test_simulator_results.html
# echo " <tr>" >> ./test_simulator_results.html
echo
" <td>Check if RA proc succeeded</td>"
>>
./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 RA check
GNB_CONNECTED
=
`
egrep
-c
"now 5G connected"
$RA_ENB_LOG
`
# GNB_RECEIVED=`egrep -c "received correctly" $RA_ENB_LOG`
#UE RA check
# GNB_CONNECTED=`egrep -c "now 5G connected" $RA_ENB_LOG`
UE_RA_PROC_OK
=
`
egrep
-c
"RA procedure succeeded"
$RA_UE_LOG
`
# #UE RA check
# UE_RA_PROC_OK=`egrep -c "RA procedure succeeded" $RA_UE_LOG`
#
if
[
$GNB_RECEIVED
-gt
0
]
&&
[
$GNB_CONNECTED
-gt
0
]
&&
[
$UE_RA_PROC_OK
-gt
0
]
#
then
# if [ $GNB_RECEIVED -gt 0 ] && [ $GNB_CONNECTED -gt 0 ] && [ $UE_RA_PROC_OK -gt 0 ]
echo
" <td bgcolor =
\"
green
\"
>OK</td>"
>>
./test_simulator_results.html
# then
else
# echo " <td bgcolor = \"green\" >OK</td>" >> ./test_simulator_results.html
echo
" <td bgcolor =
\"
red
\"
>KO</td>"
>>
./test_simulator_results.html
# else
fi
# echo " <td bgcolor = \"red\" >KO</td>" >> ./test_simulator_results.html
# fi
echo
" <td><pre>"
>>
./test_simulator_results.html
#
if
[
$GNB_RECEIVED
-gt
0
]
# echo " <td><pre>" >> ./test_simulator_results.html
then
# if [ $GNB_RECEIVED -gt 0 ]
echo
"<font color =
\"
blue
\"
>- gNB --> RA received</font>"
>>
./test_simulator_results.html
# then
else
# echo "<font color = \"blue\">- gNB --> RA received</font>" >> ./test_simulator_results.html
echo
"<font color =
\"
red
\"
><b>- gNB RA NOT RECEIVED</b></font>"
>>
./test_simulator_results.html
# else
fi
# echo "<font color = \"red\"><b>- gNB RA NOT RECEIVED</b></font>" >> ./test_simulator_results.html
if
[
$GNB_CONNECTED
-gt
0
]
# fi
then
# if [ $GNB_CONNECTED -gt 0 ]
echo
"<font color =
\"
blue
\"
>- gNB --> 5G connected</font>"
>>
./test_simulator_results.html
# then
else
# echo "<font color = \"blue\">- gNB --> 5G connected</font>" >> ./test_simulator_results.html
echo
"<font color =
\"
red
\"
><b>- gNB NOT 5G CONNECTED</b></font>"
>>
./test_simulator_results.html
# else
fi
# echo "<font color = \"red\"><b>- gNB NOT 5G CONNECTED</b></font>" >> ./test_simulator_results.html
if
[
$UE_RA_PROC_OK
-gt
0
]
# fi
then
# if [ $UE_RA_PROC_OK -gt 0 ]
echo
"<font color =
\"
blue
\"
>- NR UE --> RA procedure succeded</font>"
>>
./test_simulator_results.html
# then
else
# echo "<font color = \"blue\">- NR UE --> RA procedure succeded</font>" >> ./test_simulator_results.html
echo
"<font color =
\"
red
\"
><b>- NR UE RA procedure failed</b></font>"
>>
./test_simulator_results.html
# else
fi
# echo "<font color = \"red\"><b>- NR UE RA procedure failed</b></font>" >> ./test_simulator_results.html
echo
" </pre></td>"
>>
./test_simulator_results.html
# fi
echo
" </tr>"
>>
./test_simulator_results.html
# echo " </pre></td>" >> ./test_simulator_results.html
fi
# echo " </tr>" >> ./test_simulator_results.html
# fi
#SYNC test
#SYNC test
ENB_LOG
=
$ARCHIVES_LOC
/
${
TMODE
}
_
${
BW
}
prb_
${
CN_CONFIG
}
_gnb.log
ENB_LOG
=
$ARCHIVES_LOC
/
${
TMODE
}
_
${
BW
}
prb_
${
CN_CONFIG
}
_gnb.log
...
...
ci-scripts/runTestOnVM.sh
View file @
d0ab6456
...
@@ -1318,8 +1318,11 @@ function start_rf_sim_nr_ue {
...
@@ -1318,8 +1318,11 @@ function start_rf_sim_nr_ue {
echo
"sudo apt-get --yes install daemon >> /home/ubuntu/tmp/cmake_targets/log/daemon-install.txt 2>&1"
>>
$1
echo
"sudo apt-get --yes install daemon >> /home/ubuntu/tmp/cmake_targets/log/daemon-install.txt 2>&1"
>>
$1
echo
"echo
\"
cd /home/ubuntu/tmp/cmake_targets/ran_build/build/
\"
"
>>
$1
echo
"echo
\"
cd /home/ubuntu/tmp/cmake_targets/ran_build/build/
\"
"
>>
$1
echo
"sudo chmod 777 /home/ubuntu/tmp/cmake_targets/ran_build/build/"
>>
$1
echo
"sudo chmod 777 /home/ubuntu/tmp/cmake_targets/ran_build/build/"
>>
$1
echo
"sudo cp /home/ubuntu/tmp/r*config.raw /home/ubuntu/tmp/cmake_targets/ran_build/build/"
>>
$1
if
[
$LOC_RA_TEST
-eq
0
]
#no RA test => use --phy-test option
echo
"sudo chmod 666 /home/ubuntu/tmp/cmake_targets/ran_build/build/r*config.raw"
>>
$1
then
echo
"sudo cp /home/ubuntu/tmp/r*config.raw /home/ubuntu/tmp/cmake_targets/ran_build/build/"
>>
$1
echo
"sudo chmod 666 /home/ubuntu/tmp/cmake_targets/ran_build/build/r*config.raw"
>>
$1
fi
echo
"cd /home/ubuntu/tmp/cmake_targets/ran_build/build/"
>>
$1
echo
"cd /home/ubuntu/tmp/cmake_targets/ran_build/build/"
>>
$1
if
[
$LOC_S1_CONFIGURATION
-eq
0
]
if
[
$LOC_S1_CONFIGURATION
-eq
0
]
then
then
...
@@ -2192,26 +2195,23 @@ function run_test_on_vm {
...
@@ -2192,26 +2195,23 @@ function run_test_on_vm {
local
try_cnt
=
"0"
local
try_cnt
=
"0"
NR_STATUS
=
0
NR_STATUS
=
0
######### start of loop
######### start of
RA TEST
loop
while
[
$try_cnt
-lt
4
]
while
[
$try_cnt
-lt
1
]
do
do
#start RA test
SYNC_STATUS
=
0
SYNC_STATUS
=
0
PING_STATUS
=
0
IPERF_STATUS
=
0
echo
"############################################################"
echo
"############################################################"
echo
"
${
CN_CONFIG
}
: Starting the gNB"
echo
"
${
CN_CONFIG
}
: Starting the gNB"
echo
"############################################################"
echo
"############################################################"
CURRENT_GNB_LOG_FILE
=
tdd_
${
PRB
}
prb_
${
CN_CONFIG
}
_gnb.log
CURRENT_GNB_LOG_FILE
=
tdd_
${
PRB
}
prb_
${
CN_CONFIG
}
_gnb
_ra_test
.log
#last argument = 1 is to enable --do-ra for RA test
#last argument = 1 is to enable --do-ra for RA test
start_rf_sim_gnb
$GNB_VM_CMDS
"
$GNB_VM_IP_ADDR
"
$CURRENT_GNB_LOG_FILE
$PRB
$CONF_FILE
$S1_NOS1_CFG
1
start_rf_sim_gnb
$GNB_VM_CMDS
"
$GNB_VM_IP_ADDR
"
$CURRENT_GNB_LOG_FILE
$PRB
$CONF_FILE
$S1_NOS1_CFG
1
echo
"############################################################"
echo
"############################################################"
echo
"
${
CN_CONFIG
}
: Starting the NR-UE"
echo
"
${
CN_CONFIG
}
: Starting the NR-UE"
echo
"############################################################"
echo
"############################################################"
CURRENT_NR_UE_LOG_FILE
=
tdd_
${
PRB
}
prb_
${
CN_CONFIG
}
_ue.log
CURRENT_NR_UE_LOG_FILE
=
tdd_
${
PRB
}
prb_
${
CN_CONFIG
}
_ue
_ra_test
.log
#last argument = 1 is to enable --do-ra for RA test
#last argument = 1 is to enable --do-ra for RA test
start_rf_sim_nr_ue
$NR_UE_VM_CMDS
$NR_UE_VM_IP_ADDR
$GNB_VM_IP_ADDR
$CURRENT_NR_UE_LOG_FILE
$PRB
$FREQUENCY
$S1_NOS1_CFG
1
start_rf_sim_nr_ue
$NR_UE_VM_CMDS
$NR_UE_VM_IP_ADDR
$GNB_VM_IP_ADDR
$CURRENT_NR_UE_LOG_FILE
$PRB
$FREQUENCY
$S1_NOS1_CFG
1
if
[
$NR_UE_SYNC
-eq
0
]
if
[
$NR_UE_SYNC
-eq
0
]
...
@@ -2240,15 +2240,19 @@ function run_test_on_vm {
...
@@ -2240,15 +2240,19 @@ function run_test_on_vm {
echo
"
${
CN_CONFIG
}
: Checking RA on gNB / NR-UE"
echo
"
${
CN_CONFIG
}
: Checking RA on gNB / NR-UE"
echo
"############################################################"
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
# Proper check to be done when RA test is working!
# Proper check to be done when RA test is working!
#check_ra_result $ARCHIVES_LOC/
ra_check_$CURRENT_GNB_LOG_FILE $ARCHIVES_LOC/ra_check_
$CURRENT_NR_UE_LOG_FILE
#check_ra_result $ARCHIVES_LOC/
$CURRENT_GNB_LOG_FILE $ARCHIVES_LOC/
$CURRENT_NR_UE_LOG_FILE
try_cnt
=
$[$try_cnt
+1]
#end RA test
########### end RA test
sleep
30
done
sleep
10
try_cnt
=
"0"
######### start of PHY TEST loop
while
[
$try_cnt
-lt
4
]
do
SYNC_STATUS
=
0
SYNC_STATUS
=
0
PING_STATUS
=
0
PING_STATUS
=
0
IPERF_STATUS
=
0
IPERF_STATUS
=
0
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment