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

Modified SPECTRA demo scripts to be compatible with openair SVN version 5799

Browse Source 
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5800 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
Ferreira
2014-09-18 13:53:41 +00:00
parent 0dddb2981f
commit 2a2adda20d
9 changed files with 94 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
targets/PROJECTS/SPECTRA/build_all.bash
+8 -3
View File
@@ -69,8 +69,13 @@ echo_success "\n###############################"
echo_success "# COMPILE oaisim"
echo_success "###############################"
cd $OPENAIR_TARGETS/SIMU/USER
echo_success "Executing: make oaisim NAS=1 OAI_NW_DRIVER_TYPE_ETHERNET=1 ENABLE_ITTI=1 USER_MODE=1 OPENAIR2=1 ENABLE_RAL=1 MIH_C_MEDIEVAL_EXTENSIONS=1 USE_3GPP_ADDR_AS_LINK_ADDR=1 RLC_STOP_ON_LOST_PDU=1 Rel10=1 -j`grep -c ^processor /proc/cpuinfo `"
make --keep-going oaisim NAS=1 OAI_NW_DRIVER_TYPE_ETHERNET=1 ENABLE_ITTI=1 USER_MODE=1 OPENAIR2=1 ENABLE_RAL=1 MIH_C_MEDIEVAL_EXTENSIONS=1 USE_3GPP_ADDR_AS_LINK_ADDR=1 RLC_STOP_ON_LOST_PDU=1 Rel10=1 -j`grep -c ^processor /proc/cpuinfo `
#echo_success "Executing: make oaisim NAS=1 OAI_NW_DRIVER_TYPE_ETHERNET=1 ENABLE_ITTI=1 USER_MODE=1 OPENAIR2=1 ENABLE_RAL=1 MIH_C_MEDIEVAL_EXTENSIONS=1 USE_3GPP_ADDR_AS_LINK_ADDR=1 RLC_STOP_ON_LOST_PDU=1 Rel10=1 -j`grep -c ^processor /proc/cpuinfo `"
#make --keep-going oaisim NAS=1 OAI_NW_DRIVER_TYPE_ETHERNET=1 ENABLE_ITTI=1 USER_MODE=1 OPENAIR2=1 ENABLE_RAL=1 MIH_C_MEDIEVAL_EXTENSIONS=1 USE_3GPP_ADDR_AS_LINK_ADDR=1 RLC_STOP_ON_LOST_PDU=1 Rel10=1 -j`grep -c ^processor /proc/cpuinfo `
echo_success "Executing: make oaisim NAS=1 OAI_NW_DRIVER_TYPE_ETHERNET=1 ENABLE_ITTI=1 USER_MODE=1 OPENAIR2=1 ENABLE_RAL=1 MIH_C_MEDIEVAL_EXTENSIONS=1 USE_3GPP_ADDR_AS_LINK_ADDR=1 RLC_STOP_ON_LOST_PDU=1 -j`grep -c ^processor /proc/cpuinfo `"
#make --keep-going oaisim NAS=
make --keep-going oaisim DEBUG=1 NAS=1 OAI_NW_DRIVER_TYPE_ETHERNET=1 ENABLE_ITTI=1 USER_MODE=1 OPENAIR2=1 ENABLE_RAL=1 MIH_C_MEDIEVAL_EXTENSIONS=1 USE_3GPP_ADDR_AS_LINK_ADDR=1 RLC_STOP_ON_LOST_PDU=1 -j`grep -c ^processor /proc/cpuinfo `
if [[ $? -eq 2 ]] ; then
exit 1
fi
@@ -111,7 +116,7 @@ if [ ! -f $OPENAIR_HOME/common/utils/itti_analyzer/Makefile ]
cd objs
../configure
fi
make install -j`grep -c ^processor /proc/cpuinfo `
sudo make install -j`grep -c ^processor /proc/cpuinfo `
targets/PROJECTS/SPECTRA/env_802dot21.bash
+4 -2
View File
@@ -37,8 +37,8 @@
#####################################################
# VARIABLES TO BE FILLED WITH RIGHT VALUES:
#####################################################
export BOOST_ROOT=/usr/local/src/boost_1_49_0
export ODTONE_ROOT=/usr/local/src/ODTONE
export BOOST_ROOT=/home/alexandrie/DEMO_SPECTRA/boost_1_49_0
export ODTONE_ROOT=/home/alexandrie/DEMO_SPECTRA/ODTONE
export MIH_F=odtone-mihf
export ENB_MIH_F_CONF_FILE=odtone_enb.conf
@@ -47,6 +47,8 @@ export UE_MIH_F_CONF_FILE=odtone_ue.conf
export ODTONE_MIH_USER_DIR=$ODTONE_ROOT/app/lte_test_user
export ODTONE_MIH_EXE_DIR=$ODTONE_ROOT/dist
#export ENB_MIH_USER=enb2_lte_user
#export ENB_MIH_USER_CONF_FILE=enb2_lte_user.conf
export ENB_MIH_USER=enb_lte_user
export ENB_MIH_USER_CONF_FILE=enb_lte_user.conf
targets/PROJECTS/SPECTRA/start_enb.bash
+9 -7
View File
@@ -36,12 +36,14 @@
#------------------------------------------------
# ENB CONFIG FILE
#------------------------------------------------
declare -x ENB_CONFIG_FILE="CONF/enb.sfr.yang.conf"
#declare -x ENB_CONFIG_FILE="CONF/enb.sfr.yang.conf"
declare -x ENB_CONFIG_FILE="enb.conf"
#------------------------------------------------
# OAI NETWORKING
#------------------------------------------------
declare -x EMULATION_DEV_INTERFACE="eth1"
declare -x EMULATION_DEV_INTERFACE="eth0"
declare -x EMULATION_DEV_ADDRESS="192.168.13.1"
declare -x IP_DRIVER_NAME="oai_nw_drv"
declare -x LTEIF="oai0"
declare -x ENB_IPv4="10.0.0.1"
@@ -49,7 +51,7 @@ declare -x ENB_IPv6="2001:1::1"
declare -x ENB_IPv6_CIDR=$ENB_IPv6"/64"
declare -x ENB_IPv4_CIDR=$ENB_IPv4"/24"
declare -a NAS_IMEI=( 3 9 1 8 3 6 6 2 0 0 0 0 0 0 )
declare -x IP_DEFAULT_MARK="3"
declare -x IP_DEFAULT_MARK="1" # originally 3
#------------------------------------------------
# OAI MIH
#------------------------------------------------
@@ -64,7 +66,7 @@ LOG_FILE="/tmp/oai_sim_enb.log"
THIS_SCRIPT_PATH=$(dirname $(readlink -f $0))
source $THIS_SCRIPT_PATH/env_802dot21.bash
###########################################################
bash_exec "ifconfig $EMULATION_DEV_INTERFACE up $EMULATION_DEV_ADDRESS netmask 255.255.255.0"
###########################################################
IPTABLES=/sbin/iptables
THIS_SCRIPT_PATH=$(dirname $(readlink -f $0))
@@ -143,8 +145,7 @@ rotate_log_file $MIH_LOG_FILE
# start MIH-F
#xterm -hold -e
$ODTONE_MIH_EXE_DIR/$MIH_F --log 4 --conf.file $ODTONE_MIH_EXE_DIR/$ENB_MIH_F_CONF_FILE > $MIH_LOG_FILE 2>&1 &
xterm -hold -e $ODTONE_MIH_EXE_DIR/$MIH_F --log 4 --conf.file $ODTONE_MIH_EXE_DIR/$ENB_MIH_F_CONF_FILE > $MIH_LOG_FILE 2>&1 &
wait_process_started $MIH_F
NOW=$(date +"%Y-%m-%d.%Hh_%Mm_%Ss")
@@ -172,7 +173,8 @@ $OPENAIR_TARGETS/SIMU/USER/oaisim -a -K $LOG_FILE -l9 -u0 -b1 -M0 -p2 -g1 -D $
--enb-mihf-remote-port $ENB_MIHF_REMOTE_PORT \
--enb-mihf-ip-address $ENB_MIHF_IP_ADDRESS \
--enb-mihf-id $ENB_MIHF_ID \
-O $ENB_CONFIG_FILE | grep "RAL\|PDCP" &
-O $ENB_CONFIG_FILE > log_enb.txt &
# -O $ENB_CONFIG_FILE | grep "RAL\|PDCP" &
wait_process_started oaisim
targets/PROJECTS/SPECTRA/start_ue.bash
+35 -9
View File
@@ -36,7 +36,9 @@
#------------------------------------------------
# OAI NETWORKING
#------------------------------------------------
declare -x EMULATION_DEV_INTERFACE="eth1"
declare -x EMULATION_DEV_INTERFACE="eth0"
declare -x EMULATION_DEV_ADDRESS="192.168.13.2"
declare -x IP_DRIVER_NAME="oai_nw_drv"
declare -x LTEIF="oai0"
declare -x UE_IPv4="10.0.0.2"
@@ -44,24 +46,26 @@ declare -x UE_IPv6="2001:1::2"
declare -x UE_IPv6_CIDR=$UE_IPv6"/64"
declare -x UE_IPv4_CIDR=$UE_IPv4"/24"
declare -a NAS_IMEI=( 3 9 1 8 3 6 7 3 0 2 0 0 0 0 )
declare -x IP_DEFAULT_MARK="3"
declare -x IP_DEFAULT_MARK="1" # originally 3
#------------------------------------------------
# OAI MIH
#------------------------------------------------
declare -x UE_MIHF_IP_ADDRESS="127.0.0.1"
declare -x UE_RAL_IP_ADDRESS="127.0.0.1"
LOG_FILE="/tmp/oai_sim_enb.log"
LOG_FILE="/tmp/oai_sim_ue.log"
#------------------------------------------------
MIH_LOG_FILE="mih-f_ue.log"
# EXE options
EXE_MODE="DEBUG" # "PROD"
###########################################################
THIS_SCRIPT_PATH=$(dirname $(readlink -f $0))
source $THIS_SCRIPT_PATH/env_802dot21.bash
###########################################################
bash_exec "ifconfig $EMULATION_DEV_INTERFACE up $EMULATION_DEV_ADDRESS netmask 255.255.255.0"
###########################################################
IPTABLES=/sbin/iptables
THIS_SCRIPT_PATH=$(dirname $(readlink -f $0))
@@ -130,9 +134,12 @@ ip route add 239.0.0.160/28 dev $EMULATION_DEV_INTERFACE
rotate_log_file $MIH_LOG_FILE
echo "printing the MIH file path"
echo "$ODTONE_MIH_EXE_DIR/$MIH_F $ODTONE_MIH_EXE_DIR/$UE_MIH_F_CONF_FILE"
echo "$ODTONE_MIH_EXE_DIR/$UE_MIH_USER $ODTONE_MIH_EXE_DIR/$UE_MIH_USER_CONF_FILE"
# start MIH-F
#xterm -hold -e
$ODTONE_MIH_EXE_DIR/$MIH_F --log 4 --conf.file $ODTONE_MIH_EXE_DIR/$UE_MIH_F_CONF_FILE > $MIH_LOG_FILE 2>&1 &
xterm -hold -e $ODTONE_MIH_EXE_DIR/$MIH_F --log 4 --conf.file $ODTONE_MIH_EXE_DIR/$UE_MIH_F_CONF_FILE > $MIH_LOG_FILE 2>&1 &
wait_process_started $MIH_F
sleep 3
@@ -153,14 +160,33 @@ UE_MIHF_REMOTE_PORT=`cat $ODTONE_MIH_EXE_DIR/$UE_MIH_F_CONF_FILE | grep local_po
UE_MIHF_ID=`cat $ODTONE_MIH_EXE_DIR/$UE_MIH_F_CONF_FILE | grep id | grep \= | grep -v \# | tr -d " " | cut -d'=' -f2`
#xterm -hold -e gdb --args
$OPENAIR_TARGETS/SIMU/USER/oaisim -a -K $LOG_FILE -l9 -u1 -b0 -M1 -p2 -g1 -D $EMULATION_DEV_INTERFACE \
# $EMULATION_DEV_INTERFACE -D192.168.13.2
#sudo ip route add 239.0.0.160/28 dev $EMULATION_DEV_INTERFACE
#$OPENAIR2_DIR/NAS/DRIVER/LITE/RB_TOOL/rb_tool -a -c0 -i0 -z0 -s 10.0.0.2 -t 10.0.0.1 -r 1
if [ $EXE_MODE = "DEBUG" ] ; then
echo "$OPENAIR_TARGETS/SIMU/USER/oaisim -a -K $LOG_FILE -l7 -u1 -b0 -M1 -p2 -g1 -D $EMULATION_DEV_ADDRESS --ue-ral-listening-port $UE_RAL_LISTENING_PORT --ue-ral-link-id $UE_RAL_LINK_ID_STRIPPED --ue-ral-ip-address $UE_RAL_IP_ADDRESS --ue-mihf-remote-port $UE_MIHF_REMOTE_PORT --ue-mihf-ip-address $UE_MIHF_IP_ADDRESS --ue-mihf-id $UE_MIHF_ID "
$OPENAIR_TARGETS/SIMU/USER/oaisim -a -K $LOG_FILE -l7 -u1 -b0 -M1 -p2 -g1 -D $EMULATION_DEV_ADDRESS \
--ue-ral-listening-port $UE_RAL_LISTENING_PORT \
--ue-ral-link-id $UE_RAL_LINK_ID_STRIPPED \
--ue-ral-ip-address $UE_RAL_IP_ADDRESS \
--ue-mihf-remote-port $UE_MIHF_REMOTE_PORT \
--ue-mihf-ip-address $UE_MIHF_IP_ADDRESS \
--ue-mihf-id $UE_MIHF_ID | grep "RAL\|PDCP" &
--ue-mihf-id $UE_MIHF_ID > log_ue.txt &
else
echo "$OPENAIR_TARGETS/SIMU/USER/oaisim -a -l3 -u1 -b0 -M1 -p2 -g1 -D $EMULATION_DEV_ADDRESS --ue-ral-listening-port $UE_RAL_LISTENING_PORT --ue-ral-link-id $UE_RAL_LINK_ID_STRIPPED --ue-ral-ip-address $UE_RAL_IP_ADDRESS --ue-mihf-remote-port $UE_MIHF_REMOTE_PORT --ue-mihf-ip-address $UE_MIHF_IP_ADDRESS --ue-mihf-id $UE_MIHF_ID "
$OPENAIR_TARGETS/SIMU/USER/oaisim -a -u1 -b0 -M1 -p2 -g1 -D $EMULATION_DEV_ADDRESS \
--ue-ral-listening-port $UE_RAL_LISTENING_PORT \
--ue-ral-link-id $UE_RAL_LINK_ID_STRIPPED \
--ue-ral-ip-address $UE_RAL_IP_ADDRESS \
--ue-mihf-remote-port $UE_MIHF_REMOTE_PORT \
--ue-mihf-ip-address $UE_MIHF_IP_ADDRESS \
--ue-mihf-id $UE_MIHF_ID > /dev/null &
fi
wait_process_started oaisim