X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=docker%2Finstance_init.sh;h=a19e1ce84a07b6176ee7f69eeb9f40ed3e5f77ce;hb=9a409d89ece2c10a60db657da769e4149ff961c5;hp=7226e16c0874a9b4aba0052b9535e1181563afff;hpb=3a732a86e10186ad4639424a24996240d549b404;p=vfc%2Fnfvo%2Flcm.git

diff --git a/docker/instance_init.sh b/docker/instance_init.sh
index 7226e16c..a19e1ce8 100755
--- a/docker/instance_init.sh
+++ b/docker/instance_init.sh
@@ -1,62 +1,27 @@
 #/bin/bash
-######
-# by vfc-db test
-#####
-# echo "No service needs init."
-#MYSQL_USER=$1
-######
-pip install PyMySQL==0.9.3
-mkdir -p /service/vfc/nfvo/lcm/resources/bin/logs
-mkdir -p /var/log/onap/vfc/nslcm/
 
-if [ ! -f /service/vfc/nfvo/lcm/resources/bin/logs/django.log ]; then
-    touch /service/vfc/nfvo/lcm/resources/bin/logs/django.log
-else
-    echo >/service/vfc/nfvo/lcm/resources/bin/logs/django.log
-fi
-if [ ! -f /var/log/onap/vfc/nslcm/runtime_nslcm.log ]; then
-    touch /var/log/onap/vfc/nslcm/runtime_nslcm.log
-else
-    echo >/var/log/onap/vfc/nslcm/runtime_nslcm.log
-fi
-######
+
 MYSQL_IP=`echo $MYSQL_ADDR | cut -d: -f 1`
 MYSQL_PORT=`echo $MYSQL_ADDR | cut -d: -f 2`
-MYSQL_USER=`echo $MYSQL_AUTH | cut -d: -f 1`
-MYSQL_ROOT_PASSWORD=`echo $MYSQL_AUTH | cut -d: -f 2`
 
-function create_database {
-    #cd /service/vfc/nfvo/db/resources/nslcm/bin
-    cd /service/vfc/nfvo/lcm/resources/bin
-    bash initDB.sh $MYSQL_USER $MYSQL_ROOT_PASSWORD $MYSQL_PORT $MYSQL_IP
-    man_path=/service/vfc/nfvo/lcm
-    tab=`mysql -u${MYSQL_USER} -p${MYSQL_ROOT_PASSWORD} -P${MYSQL_PORT} -h${MYSQL_IP} -e "SELECT count(TABLE_NAME) FROM information_schema.TABLES WHERE TABLE_SCHEMA='vfcnfvolcm';"`
-    tab1=`echo $tab |awk '{print $2}'`
-	echo "=========="
-	echo $tab1
-	echo "=========="
-    if [ $tab1 -eq 0 ] ; then
-	echo "============"
-	echo $tab1
-	echo "============"
-        echo "TABLE NOT EXISTS, START MIGRATE"
-        python $man_path/manage.py makemigrations && python $man_path/manage.py migrate &
-        wait
-        tab2=`mysql -u${MYSQL_USER} -p${MYSQL_ROOT_PASSWORD} -P${MYSQL_PORT} -h${MYSQL_IP} -e "SELECT count(TABLE_NAME) FROM information_schema.TABLES WHERE TABLE_SCHEMA='vfcnfvolcm';"`
-	tab3=`echo $tab2|awk '{print $2}'`
-        if [ $tab3 -gt 0  ] ; then
-        echo "TABLE CREATE uUCCESSFUL"
-    fi
+if [ $MYSQL_ROOT_USER ] && [ $MYSQL_ROOT_PASSWORD ]; then
+    MYSQL_ROOT_USER=$MYSQL_ROOT_USER
+    MYSQL_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD
 else
-    echo "table already existed"
-    exit 1
+    MYSQL_ROOT_USER="root"
+    MYSQL_ROOT_PASSWORD="root"
 fi
- }
 
-if [ ! -f /service/vfc/nfvo/lcm/docker/db.txt ]; then
-    echo 1 > /service/vfc/nfvo/lcm/docker/db.txt
-    echo `pwd` >> db.txt
-    create_database
-else
-    echo "database already existed"
-fi
+function create_database {
+    cd /service/vfc/nfvo/lcm/resources/bin
+    bash initDB.sh $MYSQL_ROOT_USER $MYSQL_ROOT_PASSWORD $MYSQL_PORT $MYSQL_IP
+}
+
+function migrate_database {
+    cd /service/vfc/nfvo/lcm
+    python manage.py migrate
+}
+
+create_database
+migrate_database
+