maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CI: fixes after peer review

Browse Source 
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
This commit is contained in:
Raphael Defosseux
2019-06-18 14:41:01 +02:00
parent c6d43476d8
commit 0c8618987d
1 changed files with 30 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci-scripts/runTestOnVM.sh
+30 -34
View File
@@ -620,9 +620,9 @@ function retrieve_real_epc_ip_addr {
rm $LOC_EPC_VM_CMDS rm $LOC_EPC_VM_CMDS
fi fi
else else
REAL_EPC_IP_ADDR=$EPC_TUN_IPADDR REAL_EPC_IP_ADDR=$EPC_TUN_IPADDR
fi fi
echo "EPC IP Address is : $REAL_EPC_IP_ADDR" echo "EPC IP Address is : $REAL_EPC_IP_ADDR"
} }
function terminate_epc { function terminate_epc {
@@ -1128,7 +1128,7 @@ function run_test_on_vm {
echo "No run on VM testing for this variant currently" echo "No run on VM testing for this variant currently"
return return
fi fi
if [[ $RUN_OPTIONS =~ .*run_exec_autotests.* ]] if [[ $RUN_OPTIONS =~ .*run_exec_autotests.* ]]
then then
echo "############################################################" echo "############################################################"
@@ -1256,19 +1256,15 @@ function run_test_on_vm {
# Starting EPC # Starting EPC
start_epc $EPC_VM_NAME $EPC_VM_CMDS $EPC_VM_IP_ADDR start_epc $EPC_VM_NAME $EPC_VM_CMDS $EPC_VM_IP_ADDR
else else
echo "We will use EPC on $EPC_IPADDR" echo "We will use EPC on $EPC_IPADDR"
EPC_VM_IP_ADDR=$EPC_IPADDR EPC_VM_IP_ADDR=$EPC_IPADDR
fi fi
# Retrieve EPC real IP address # Retrieve EPC real IP address
retrieve_real_epc_ip_addr $EPC_VM_NAME $EPC_VM_CMDS $EPC_VM_IP_ADDR retrieve_real_epc_ip_addr $EPC_VM_NAME $EPC_VM_CMDS $EPC_VM_IP_ADDR
#TRANS_MODES=("fdd" "tdd") TRANS_MODES=("fdd" "tdd")
#BW_CASES=(05 10 20) BW_CASES=(05 10 20)
TRANS_MODES=("fdd")
BW_CASES=(05)
for TMODE in ${TRANS_MODES[@]} for TMODE in ${TRANS_MODES[@]}
do do
@@ -1301,10 +1297,7 @@ function run_test_on_vm {
continue continue
fi fi
get_ue_ip_addr $VM_CMDS $VM_IP_ADDR 1 get_ue_ip_addr $VM_CMDS $VM_IP_ADDR 1
full_terminate
continue
echo "############################################################" echo "############################################################"
echo "Pinging the UE" echo "Pinging the UE"
echo "############################################################" echo "############################################################"
@@ -1497,24 +1490,26 @@ function run_test_on_vm {
do do
if [[ $CN_CONFIG =~ .*wS1.* ]] if [[ $CN_CONFIG =~ .*wS1.* ]]
then then
if [[ "$EPC_IPADDR" == "" ]] if [[ "$EPC_IPADDR" == "" ]]
then then
echo "############################################################" echo "############################################################"
echo "Start EPC for the wS1 configuration" echo "Start EPC for the wS1 configuration"
echo "############################################################" echo "############################################################"
start_epc $EPC_VM_NAME $EPC_VM_CMDS $EPC_VM_IP_ADDR start_epc $EPC_VM_NAME $EPC_VM_CMDS $EPC_VM_IP_ADDR
# Retrieve EPC real IP address # Retrieve EPC real IP address
retrieve_real_epc_ip_addr $EPC_VM_NAME $EPC_VM_CMDS $EPC_VM_IP_ADDR retrieve_real_epc_ip_addr $EPC_VM_NAME $EPC_VM_CMDS $EPC_VM_IP_ADDR
S1_NOS1_CFG=1 S1_NOS1_CFG=1
else else
echo "############################################################" echo "############################################################"
echo "Using external EPC " $EPC_IPADDR echo "Using external EPC " $EPC_IPADDR
echo "############################################################" echo "############################################################"
$EPC_VM_IP_ADDR=$EPC_IPADDR $EPC_VM_IP_ADDR=$EPC_IPADDR
S1_NOS1_CFG=1 S1_NOS1_CFG=1
LTEBOX=0 LTEBOX=0
fi fi
else else
if [[ "$EPC_IPADDR" == "" ]]
then
echo "############################################################" echo "############################################################"
echo "Terminate EPC" echo "Terminate EPC"
echo "############################################################" echo "############################################################"
@@ -1524,6 +1519,7 @@ function run_test_on_vm {
echo "Running now in a no-S1 " echo "Running now in a no-S1 "
echo "############################################################" echo "############################################################"
S1_NOS1_CFG=0 S1_NOS1_CFG=0
fi
fi fi
for TMODE in ${TRANS_MODES[@]} for TMODE in ${TRANS_MODES[@]}
do do