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

config string SGI address changed

Browse Source 
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5392 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
Lionel Gauthier
2014-06-12 08:50:45 +00:00
parent 5fc23d766f
commit 43828d94cd
14 changed files with 103 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT.ENB_IS_CALISSON.MME_IS_YANG/epc.yang.conf
+1 -1
View File
@@ -111,7 +111,7 @@ P-GW =
PGW_IPV4_ADDRESS_FOR_S5_S8 = "0.0.0.0/24";
PGW_INTERFACE_NAME_FOR_SGI = "none";
PGW_IPV4_ADDR_FOR_SGI = "0.0.0.0/24";
PGW_IPV4_ADDRESS_FOR_SGI = "0.0.0.0/24";
};
IP_ADDRESS_POOL :
targets/PROJECTS/GENERIC-LTE-EPC/CONF/VIRTUAL.ENB_MME_IN_1_HOST/epc_sfr_calisson.conf
+1 -1
View File
@@ -100,7 +100,7 @@ P-GW =
PGW_INTERFACE_NAME_FOR_S5_S8 = "none";
PGW_IPV4_ADDRESS_FOR_S5_S8 = "192.168.5.1/24";
PGW_INTERFACE_NAME_FOR_SGI = "eth1";
PGW_INTERFACE_NAME_FOR_SGI = "none";
PGW_IPV4_ADDRESS_FOR_SGI = "192.168.13.17/24";
};
targets/PROJECTS/GENERIC-LTE-EPC/CONF/VIRTUAL.ENB_MME_IN_1_HOST/epc_sfr_olympie-Latitude-E6520.conf
+12 -8
View File
@@ -24,9 +24,11 @@ MME :
S6A :
{
MME_INTERFACE_NAME_FOR_S6A = "tun61";
MME_IPV4_ADDRESS_FOR_S6A = "192.168.60.145/24";
#MME_INTERFACE_NAME_FOR_S6A = "tun61";
#MME_IPV4_ADDRESS_FOR_S6A = "192.168.60.145/24";
S6A_CONF = "./UTILS/CONF/s6a.conf";
MME_INTERFACE_NAME_FOR_S6A = "eth0";
MME_IPV4_ADDRESS_FOR_S6A = "192.168.12.175/24";
};
# ------- SCTP definitions
@@ -93,15 +95,15 @@ S-GW :
};
};
P-GW =
P-GW :
{
NETWORK_INTERFACES :
{
PGW_INTERFACE_NAME_FOR_S5_S8 = "none";
PGW_IPV4_ADDRESS_FOR_S5_S8 = "192.168.5.1/24";
PGW_INTERFACE_NAME_FOR_SGI = "none";
PGW_IPV4_ADDRESS_FOR_SGI = "192.168.13.17/24";
PGW_INTERFACE_NAME_FOR_SGI = "eth1";
PGW_IPV4_ADDRESS_FOR_SGI = "192.168.13.175/24";
};
IP_ADDRESS_POOL :
@@ -122,12 +124,14 @@ P-GW =
};
};
HSS =
HSS :
{
NETWORK_INTERFACES :
{
HSS_INTERFACE_NAME_FOR_S6A = "tun60";
HSS_IPV4_ADDRESS_FOR_S6A = "192.168.60.17/24";
# HSS_INTERFACE_NAME_FOR_S6A = "tun60";
# HSS_IPV4_ADDRESS_FOR_S6A = "192.168.60.17/24";
HSS_INTERFACE_NAME_FOR_S6A = "none";
HSS_IPV4_ADDRESS_FOR_S6A = "192.168.12.190/24";
};
};
targets/PROJECTS/GENERIC-LTE-EPC/CONF/VLAN.VIRTUAL.YANG-HADES/epc.sfr.hades.vlan.conf
+1 -1
View File
@@ -108,7 +108,7 @@ P-GW =
PGW_IPV4_ADDRESS_FOR_S5_S8 = "192.168.5.1/24";
PGW_INTERFACE_NAME_FOR_SGI = "none";
PGW_IPV4_ADDR_FOR_SGI = "192.168.14.17/24";
PGW_IPV4_ADDRESS_FOR_SGI = "192.168.14.17/24";
};
IP_ADDRESS_POOL :
targets/PROJECTS/GENERIC-LTE-EPC/CONF/VSWITCH.VIRTUAL.YANG/epc.sfr.yang.vswitch.conf
+1 -1
View File
@@ -99,7 +99,7 @@ P-GW =
PGW_IPV4_ADDRESS_FOR_S5_S8 = "192.168.5.1/24";
PGW_INTERFACE_NAME_FOR_SGI = "eth1";
PGW_IPV4_ADDR_FOR_SGI = "192.168.13.17/24";
PGW_IPV4_ADDRESS_FOR_SGI = "192.168.13.17/24";
};
IP_ADDRESS_POOL :
targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.pft.sud.conf
+1 -1
View File
@@ -104,7 +104,7 @@ P-GW =
PGW_IPV4_ADDRESS_FOR_S5_S8 = "192.168.5.1/24";
PGW_INTERFACE_NAME_FOR_SGI = "eth0";
PGW_IPV4_ADDR_FOR_SGI = "192.168.12.31/24";
PGW_IPV4_ADDRESS_FOR_SGI = "192.168.12.31/24";
};
IP_ADDRESS_POOL :
targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.sfr.default.vlan.conf
+1 -1
View File
@@ -94,7 +94,7 @@ P-GW =
PGW_IPV4_ADDRESS_FOR_S5_S8 = "192.168.5.1/24";
PGW_INTERFACE_NAME_FOR_SGI = "eth1";
PGW_IPV4_ADDR_FOR_SGI = "192.168.14.175/24";
PGW_IPV4_ADDRESS_FOR_SGI = "192.168.14.175/24";
};
IP_ADDRESS_POOL :
targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.sfr.hades.vlan.conf
+1 -1
View File
@@ -104,7 +104,7 @@ P-GW =
PGW_IPV4_ADDRESS_FOR_S5_S8 = "192.168.5.1/24";
PGW_INTERFACE_NAME_FOR_SGI = "eth4";
PGW_IPV4_ADDR_FOR_SGI = "192.168.14.145/24";
PGW_IPV4_ADDRESS_FOR_SGI = "192.168.14.145/24";
};
IP_ADDRESS_POOL :
targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.sfr.yang.vswitch.conf
+1 -1
View File
@@ -99,7 +99,7 @@ P-GW =
PGW_IPV4_ADDRESS_FOR_S5_S8 = "192.168.5.1/24";
PGW_INTERFACE_NAME_FOR_SGI = "eth2";
PGW_IPV4_ADDR_FOR_SGI = "192.168.13.17/24";
PGW_IPV4_ADDRESS_FOR_SGI = "192.168.13.17/24";
};
IP_ADDRESS_POOL :
targets/PROJECTS/GENERIC-LTE-EPC/start_mme_and_enb_and_ue_virt.bash
+11 -8
View File
@@ -79,8 +79,8 @@ declare UE_IPv4_CIDR=$UE_IPv4"/24"
declare MME_ITTI_LOG_FILE=./itti_mme.$HOSTNAME.log
declare MME_STDOUT_LOG_FILE=./stdout_mme.$HOSTNAME.log
declare MME_PCAP_LOG_FILE=./tshark_s1_mme.$HOSTNAME.pcap
declare ITTI_LOG_FILE=./OUTPUT/itti_enb_ue.$HOSTNAME.log
declare STDOUT_LOG_FILE=./OUTPUT/stdout_enb_ue.$HOSTNAME.log
declare ITTI_LOG_FILE=./itti_enb_ue.$HOSTNAME.log
declare STDOUT_LOG_FILE=./stdout_enb_ue.$HOSTNAME.log
declare PCAP_LOG_FILE=./tshark_enb.$HOSTNAME.pcap
###########################################################
THIS_SCRIPT_PATH=$(dirname $(readlink -f $0))
@@ -257,6 +257,7 @@ then
echo_success "Created OUTPUT/$HOSTNAME directory"
fi
cd OUTPUT/$HOSTNAME
rotate_log_file $MME_ITTI_LOG_FILE
rotate_log_file $MME_STDOUT_LOG_FILE
rotate_log_file $MME_PCAP_LOG_FILE
@@ -265,8 +266,8 @@ cd $OPENAIRCN_DIR/$OBJ_DIR
nohup tshark -i MME_INTERFACE_NAME_FOR_S1_MME -w $THIS_SCRIPT_PATH/OUTPUT/$HOSTNAME/$MME_PCAP_LOG_FILE &
$OPENAIRCN_DIR/$OBJ_DIR/OAI_EPC/oai_epc -K $THIS_SCRIPT_PATH/OUTPUT/$HOSTNAME/$MME_ITTI_LOG_FILE -c $THIS_SCRIPT_PATH/$CONFIG_FILE_EPC 2>&1 | tee $THIS_SCRIPT_PATH/OUTPUT/$HOSTNAME/$MME_STDOUT_LOG_FILE &
#nohup xterm -e $OPENAIRCN_DIR/$OBJ_DIR/OAI_EPC/oai_epc -K $THIS_SCRIPT_PATH/OUTPUT/$HOSTNAME/$MME_ITTI_LOG_FILE -c $THIS_SCRIPT_PATH/$CONFIG_FILE_EPC 2>&1 | tee $THIS_SCRIPT_PATH/OUTPUT/$HOSTNAME/$MME_STDOUT_LOG_FILE &
#gdb --args $OPENAIRCN_DIR/$OBJ_DIR/OAI_EPC/oai_epc -K $THIS_SCRIPT_PATH/OUTPUT/$HOSTNAME/$MME_ITTI_LOG_FILE -c $THIS_SCRIPT_PATH/$CONFIG_FILE_EPC 2>&1 | tee $THIS_SCRIPT_PATH/OUTPUT/$HOSTNAME/$MME_STDOUT_LOG_FILE
nohup xterm -hold -e gdb --args $OPENAIRCN_DIR/$OBJ_DIR/OAI_EPC/oai_epc -K $THIS_SCRIPT_PATH/OUTPUT/$HOSTNAME/$MME_ITTI_LOG_FILE -c $THIS_SCRIPT_PATH/$CONFIG_FILE_EPC 2>&1 | tee $THIS_SCRIPT_PATH/OUTPUT/$HOSTNAME/$MME_STDOUT_LOG_FILE &
##################################################
@@ -304,6 +305,8 @@ fi
ip rule add fwmark 5 table lte
ip route add default dev $LTEIF table lte
cd OUTPUT/$HOSTNAME
rotate_log_file $ITTI_LOG_FILE
rotate_log_file $STDOUT_LOG_FILE
rotate_log_file $STDOUT_LOG_FILE.filtered
@@ -311,15 +314,15 @@ rotate_log_file $PCAP_LOG_FILE
cd $THIS_SCRIPT_PATH
nohup tshark -i $ENB_INTERFACE_NAME_FOR_S1_MME -i $ENB_INTERFACE_NAME_FOR_S1U -w $PCAP_LOG_FILE &
nohup tshark -i $ENB_INTERFACE_NAME_FOR_S1_MME -i $ENB_INTERFACE_NAME_FOR_S1U -w OUTPUT/$HOSTNAME/$PCAP_LOG_FILE &
nohup xterm -e $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/UserProcess &
gdb --args $OPENAIR_TARGETS/SIMU/USER/oaisim -a -u1 -l9 -K $ITTI_LOG_FILE --enb-conf $CONFIG_FILE_ENB 2>&1 | tee $STDOUT_LOG_FILE
gdb --args $OPENAIR_TARGETS/SIMU/USER/oaisim -a -u1 -l9 -K $ITTI_LOG_FILE --enb-conf $CONFIG_FILE_ENB 2>&1 | tee OUTPUT/$HOSTNAME/$STDOUT_LOG_FILE
pkill tshark
cat $STDOUT_LOG_FILE | grep -v '[PHY]' | grep -v '[MAC]' | grep -v '[EMU]' | \
cat OUTPUT/$HOSTNAME/$STDOUT_LOG_FILE | grep -v '[PHY]' | grep -v '[MAC]' | grep -v '[EMU]' | \
grep -v '[OCM]' | grep -v '[OMG]' | \
grep -v 'RLC not configured' | grep -v 'check if serving becomes' | \
grep -v 'mac_rrc_data_req' | grep -v 'BCCH request =>' > $STDOUT_LOG_FILE.filtered
grep -v 'mac_rrc_data_req' | grep -v 'BCCH request =>' > OUTPUT/$HOSTNAME/$STDOUT_LOG_FILE.filtered
targets/PROJECTS/GENERIC-LTE-EPC/utils.bash
+31 -49
View File
@@ -728,13 +728,32 @@ build_tun_network() {
set_interface_up $MME_INTERFACE_NAME_FOR_S11_MME $MME_IPV4_ADDRESS_FOR_S11_MME $MME_IPV4_NETMASK_FOR_S11_MME
set_interface_up $SGW_INTERFACE_NAME_FOR_S11 $SGW_IPV4_ADDRESS_FOR_S11 $SGW_IPV4_NETMASK_FOR_S11
set_interface_up $MME_INTERFACE_NAME_FOR_S11_MME $MME_IPV4_ADDRESS_FOR_S11_MME $MME_IPV4_NETMASK_FOR_S11_MME
set_interface_up $SGW_INTERFACE_NAME_FOR_S11 $SGW_IPV4_ADDRESS_FOR_S11 $SGW_IPV4_NETMASK_FOR_S11
set_interface_up $MME_INTERFACE_NAME_FOR_S6A $MME_IPV4_ADDRESS_FOR_S6A $MME_IPV4_NETMASK_FOR_S6A
set_interface_up $HSS_INTERFACE_NAME_FOR_S6A $HSS_IPV4_ADDRESS_FOR_S6A $HSS_IPV4_NETMASK_FOR_S6A
}
# arg1 is IF1 IP addr
# arg2 is IF2 IP addr
test_local_iperf() {
TRY_NO=3
until [ $TRY_NO -lt 1 ]; do
iperf --bind $1 -u -s 2>&1 > /dev/null &
iperf --bind $2 -u --num 1K -c $1 2>&1 | grep -i WARNING > /dev/null
if [ $? -eq 0 ]; then
pkill iperf 2>&1 > /dev/null
echo_warning "NETWORK TEST FAILED between $1 and $2"
else
echo_success "NETWORK TEST SUCCESS between $1 and $2"
pkill iperf 2>&1 > /dev/null
return
fi
let TRY_NO-=1
pkill iperf 2>&1 > /dev/null
done
echo_fatal "FATAL: NETWORK TEST FAILED between $1 and $2"
}
test_tun_network() {
# TEST INTERFACES
@@ -757,51 +776,14 @@ test_tun_network() {
## TEST NETWORK BETWEEN ENB-MME-SP-GW
iperf --bind $MME_IPV4_ADDRESS_FOR_S1_MME -u -s 2>&1 > /dev/null &
iperf --bind $ENB_IPV4_ADDRESS_FOR_S1_MME -u --num 1K -c $MME_IPV4_ADDRESS_FOR_S1_MME 2>&1 | grep -i WARNING > /dev/null
if [ $? -eq 0 ]; then
pkill iperf 2>&1 > /dev/null
echo_fatal 'NETWORK ERROR CONFIGURATION (tun) between ENB and MME S1'
else
echo_success 'NETWORK TEST SUCCESS (tun) between ENB and MME S1'
fi
pkill iperf 2>&1 > /dev/null
iperf --bind $SGW_IPV4_ADDRESS_FOR_S1U_S12_S4_UP -u -s 2>&1 > /dev/null &
iperf --bind $ENB_IPV4_ADDRESS_FOR_S1U -u --num 1K -c $SGW_IPV4_ADDRESS_FOR_S1U_S12_S4_UP 2>&1 | grep -i WARNING > /dev/null
if [ $? -eq 0 ]; then
pkill iperf 2>&1 > /dev/null
echo_fatal 'NETWORK ERROR CONFIGURATION (tun) between ENB and S-GW S1-U'
else
echo_success 'NETWORK TEST SUCCESS (tun) between ENB and S-GW S1-U'
fi
pkill iperf 2>&1 > /dev/null
iperf --bind $SGW_IPV4_ADDRESS_FOR_S11 -u -s 2>&1 > /dev/null &
iperf --bind $MME_IPV4_ADDRESS_FOR_S11_MME -u --num 1K -c $SGW_IPV4_ADDRESS_FOR_S11 2>&1 | grep -i WARNING > /dev/null
if [ $? -eq 0 ]; then
pkill iperf 2>&1 > /dev/null
echo_fatal 'NETWORK ERROR CONFIGURATION (tun) between MME and S-GW S11'
else
echo_success 'NETWORK TEST SUCCESS (tun) between MME and S-GW S11'
fi
pkill iperf 2>&1 > /dev/null
iperf --bind $HSS_IPV4_ADDRESS_FOR_S6A -u -s 2>&1 > /dev/null &
iperf --bind $MME_IPV4_ADDRESS_FOR_S6A -u --num 1K -c $HSS_IPV4_ADDRESS_FOR_S6A 2>&1 | grep -i WARNING > /dev/null
if [ $? -eq 0 ]; then
pkill iperf 2>&1 > /dev/null
echo_fatal 'NETWORK ERROR CONFIGURATION (tun) between MME and HSS S6A'
else
echo_success 'NETWORK TEST SUCCESS (openvswitch) between MME and S-GW S11'
fi
pkill iperf 2>&1 > /dev/null
test_local_iperf $ENB_IPV4_ADDRESS_FOR_S1_MME $MME_IPV4_ADDRESS_FOR_S1_MME
test_local_iperf $ENB_IPV4_ADDRESS_FOR_S1U $SGW_IPV4_ADDRESS_FOR_S1U_S12_S4_UP
test_local_iperf $MME_IPV4_ADDRESS_FOR_S11_MME $SGW_IPV4_ADDRESS_FOR_S11
test_local_iperf $MME_IPV4_ADDRESS_FOR_S6A $HSS_IPV4_ADDRESS_FOR_S6A
# Get MAC address of router.eur
ping -c 1 hss.eur > /dev/null || { echo_fatal "hss.eur does not respond to ping" >&2 ; }
#TEMP ping -c 1 router.eur > /dev/null || { echo_fatal "router.eur does not respond to ping" >&2 ; }
ping -c 1 router.eur > /dev/null || { echo_fatal "router.eur does not respond to ping" >&2 ; }
return 0
}
@@ -824,10 +806,10 @@ build_epc_tun_network() {
build_tun_network
#TEMP ping -c 1 router.eur > /dev/null || { echo_fatal "router.eur does not respond to ping" >&2 ; }
#TEMP IP_ROUTER=`python -c 'import socket; print socket.gethostbyname("router.eur")'`
#TEMP export MAC_ROUTER=`ip neigh show | grep $IP_ROUTER | cut -d ' ' -f5 | tr -d ':'`
#TEMP echo_success "ROUTER MAC ADDRESS= $MAC_ROUTER"
ping -c 1 router.eur > /dev/null || { echo_fatal "router.eur does not respond to ping" >&2 ; }
IP_ROUTER=`python -c 'import socket; print socket.gethostbyname("router.eur")'`
export MAC_ROUTER=`ip neigh show | grep $IP_ROUTER | cut -d ' ' -f5 | tr -d ':'`
echo_success "ROUTER MAC ADDRESS= $MAC_ROUTER"
bash_exec "modprobe 8021q"