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

for HSS

Browse Source 
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6364 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
Lionel Gauthier
2015-01-14 14:01:47 +00:00
parent a927143eb1
commit d1c366e5be
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
targets/build_helper.bash
+22 -16
View File
@@ -320,7 +320,7 @@ check_epc_s6a_certificate() {
if [ a$full_hostname == a`hostname`.${1:-'eur'} ] if [ a$full_hostname == a`hostname`.${1:-'eur'} ]
then then
echo_success "EPC S6A: Found valid certificate in /usr/local/etc/freeDiameter" echo_success "EPC S6A: Found valid certificate in /usr/local/etc/freeDiameter"
return 1 return 0
fi fi
fi fi
fi fi
@@ -329,7 +329,8 @@ check_epc_s6a_certificate() {
cd $OPENAIRCN_DIR/S6A/freediameter cd $OPENAIRCN_DIR/S6A/freediameter
./make_certs.sh ${1:-'eur'} ./make_certs.sh ${1:-'eur'}
if [ $# -lt 2 ] ; then if [ $# -lt 2 ] ; then
check_epc_s6a_certificate ${1:-'eur'} 2 __i=check_epc_s6a_certificate ${1:-'eur'} 2
return $__i
else else
exit 1 exit 1
fi fi
@@ -356,8 +357,9 @@ check_hss_s6a_certificate() {
if [ $# -lt 2 ] ; then if [ $# -lt 2 ] ; then
__i=check_hss_s6a_certificate ${1:-'eur'} 2 __i=check_hss_s6a_certificate ${1:-'eur'} 2
return $__i return $__i
else
exit 1
fi fi
return 1
} }
check_install_usrp_uhd_driver(){ check_install_usrp_uhd_driver(){
@@ -858,15 +860,14 @@ check_for_ltesoftmodem_executable() {
check_for_epc_executable() { check_for_epc_executable() {
if [ ! -f $OPENAIRCN_DIR/objs/OAI_EPC/oai_epc ]; then if [ ! -f $OPENAIRCN_DIR/objs/OAI_EPC/oai_epc ]; then
echo_error "Cannot find oai_epc executable object in directory $OPENAIRCN_DIR/objs/OAI_EPC/" echo_error "Cannot find oai_epc executable object in directory $OPENAIRCN_DIR/objs/OAI_EPC/"
echo_error "Please make sure you have compiled OAI EPC with --enable-standalone-epc option" echo_fatal "Please make sure you have compiled OAI EPC with --enable-standalone-epc option"
fi fi
} }
check_for_hss_executable() { check_for_hss_executable() {
if [ ! -f $OPENAIRCN_DIR/OPENAIRHSS/objs/openair-hss ]; then if [ ! -f $OPENAIRCN_DIR/OPENAIRHSS/objs/openair-hss ]; then
echo_error "Cannot find openair-hss executable object in directory $OPENAIRCN_DIR/OPENAIRHSS/objs/" echo_error "Cannot find openair-hss executable object in directory $OPENAIRCN_DIR/OPENAIRHSS/objs/"
echo_error "Please make sure you have compiled OAI HSS" echo_fatal "Please make sure you have compiled OAI HSS"
exit 1
fi fi
} }
@@ -1006,7 +1007,7 @@ create_hss_database(){
if [ $# -ne $EXPECTED_ARGS ] if [ $# -ne $EXPECTED_ARGS ]
then then
echo_fatal "Usage: $0 dbuser dbpass" echo_fatal "Usage: $0 dbuser dbpass"
rv=1 rv=1
fi fi
set_openair_env set_openair_env
@@ -1016,17 +1017,22 @@ create_hss_database(){
$MYSQL -u $1 --password=$2 -e "$SQL" $MYSQL -u $1 --password=$2 -e "$SQL"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo_error "oai_db creation failed" echo_error "oai_db creation failed"
rv=1 return 1
else else
echo_success "oai_db creation succeeded" echo_success "oai_db creation succeeded"
fi fi
$MYSQL -u $1 --password=$2 oai_db < $OPENAIRCN_DIR/OPENAIRHSS/db/oai_db.sql # test if tables have been created
if [ $? -ne 0 ]; then mysql -u $1 --password=$2 -e "desc oai_db.users" > /dev/null 2>&1
echo_error "oai_db tables creation failed"
rv=1 if [ $? -eq 1 ]; then
else $MYSQL -u $1 --password=$2 oai_db < $OPENAIRCN_DIR/OPENAIRHSS/db/oai_db.sql
echo_success "oai_db tables creation succeeded" if [ $? -ne 0 ]; then
echo_error "oai_db tables creation failed"
return 1
else
echo_success "oai_db tables creation succeeded"
fi
fi fi
Q1="GRANT ALL PRIVILEGES ON *.* TO 'hssadmin'@'%' IDENTIFIED BY 'admin' WITH GRANT OPTION;" Q1="GRANT ALL PRIVILEGES ON *.* TO 'hssadmin'@'%' IDENTIFIED BY 'admin' WITH GRANT OPTION;"
@@ -1035,11 +1041,11 @@ create_hss_database(){
$MYSQL -u $1 --password=$2 -e "$SQL" $MYSQL -u $1 --password=$2 -e "$SQL"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo_error "hssadmin permissions failed" echo_error "hssadmin permissions failed"
rv=1 return 1
else else
echo_success "hssadmin permissions succeeded" echo_success "hssadmin permissions succeeded"
fi fi
return rv return 0
} }
################################ ################################