diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/interfaces.bash b/targets/PROJECTS/GENERIC-LTE-EPC/interfaces.bash index 1612a9524f918474cda965d85997637b5f2d616d..83e2eb9aea0774432c532155b687470f4ac5aad4 100755 --- a/targets/PROJECTS/GENERIC-LTE-EPC/interfaces.bash +++ b/targets/PROJECTS/GENERIC-LTE-EPC/interfaces.bash @@ -253,6 +253,7 @@ get_ip() { } get_mac_router() { + echo_success "Resolving router.eur" ping -c 1 router.eur > /dev/null || { echo_fatal "router.eur does not respond to ping" >&2 ; } IP_ROUTER=$(get_ip router.eur) #IP_ROUTER=`python -c 'import socket; print socket.gethostbyname("router.eur")'` diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/start_epc.bash b/targets/PROJECTS/GENERIC-LTE-EPC/start_epc.bash index d22ecf91d4e2cd4272c8dded016c6da343a1ab70..a606c417dbe666ce8c4355b9efb1dca939c3677d 100755 --- a/targets/PROJECTS/GENERIC-LTE-EPC/start_epc.bash +++ b/targets/PROJECTS/GENERIC-LTE-EPC/start_epc.bash @@ -106,29 +106,6 @@ # | | # +---------------------------------------------------------------------------+ # -########################################################################################################################### -# VLAN SETTING -########################################################################################################################### -# each box is a host hss.eur -# | -# +-----------+ +-----------+ v +----------+ -# | eNB +------+ VLAN 1+------+ MME +----+ +---+ HSS | -# | |ethx.1+------------------+ethy.1| | +------+ | | -# | +------+ +------+ +----+ +---+ | -# | |ethx.2+-------+ | | +----------+ -# | +------+ | +-+-------+-+ -# | | | | s11mme| -# | | | +---+---+ -# | | | (optional)| VLAN 3 -# +-----------+ | +---+---+ -# | | s11sgw| router.eur -# | +-+-------+-+ | +--------------+ -# | | S+P-GW | v | ROUTER | -# | VLAN2 +------+ +-------+ +----+ +----+ -# +----------+ethy.2| |sgi +-...-+ | | +---...Internet -# +------+ +-------+ +----+ +----+ -# | | 11 VLANS | | -# +-----------+ ids=[5..15] +--------------+ ########################################################### THIS_SCRIPT_PATH=$(dirname $(readlink -f $0)) @@ -301,6 +278,7 @@ PGW_IPV4_ADDR_FOR_SGI=$( echo $PGW_IPV4_ADDR_FOR_SGI # clean_epc_vlan_network # create_sgi_vlans #fi + get_mac_router ################################################## @@ -338,6 +316,7 @@ chmod 777 $THIS_SCRIPT_PATH/kill_epc.bash trap control_c SIGINT +echo_success "Resolving hss.eur" HSS_IP=$(get_ip hss.eur) echo_success "HSS_IP: $HSS_IP" MME_INTERFACE_NAME_FOR_S6A=`ip route get $HSS_IP | grep $HSS_IP | cut -d ' ' -f 3`