X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Fdocker%2Finstance_init.sh;h=88a9c4e0affdfbf77c354d2a3cc0b0eb41548118;hb=c34f198cfe71e2e3e159ea10563c265faf571f6a;hp=46a3db072d7adb9a85fb72de093e8256c334ba00;hpb=fc22a341ea5db3b3a0bb3e152acbff7e20d3851b;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/docker/instance_init.sh b/lcm/docker/instance_init.sh
index 46a3db07..88a9c4e0 100755
--- a/lcm/docker/instance_init.sh
+++ b/lcm/docker/instance_init.sh
@@ -1,66 +1,32 @@
 #!/bin/bash
-######
-# by vfc-db test
-#####
-# echo "No service needs init."
-#MYSQL_USER=$1
-######
-#by duan
-pip install PyMySQL==0.9.3
-if [ ! -f /service/vfc/gvnfm/vnflcm/lcm/resources/bin/logs/django.log ]; then
-    mkdir -p /service/vfc/gvnfm/vnflcm/lcm/resources/bin/logs/
-    touch /service/vfc/gvnfm/vnflcm/lcm/resources/bin/logs/django.log
-else
-    echo >/service/vfc/gvnfm/vnflcm/lcm/resources/bin/logs/django.log
-fi
-
-if [ ! -f /var/log/onap/vfc/gvnfm-vnflcm/runtime_lcm.log ]; then
-    mkdir -p /var/log/onap/vfc/gvnfm-vnflcm/
-    touch /var/log/onap/vfc/gvnfm-vnflcm/runtime_lcm.log
-else
-    echo >/var/log/onap/vfc/gvnfm-vnflcm/runtime_lcm.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/gvnfm/vnflcm/lcm/resources/bin
-    bash initDB.sh $MYSQL_USER $MYSQL_ROOT_PASSWORD $MYSQL_PORT $MYSQL_IP
-    #DIRNAME=`dirname $0`
-    #HOME=`cd $DIRNAME/; pwd`
-    #man_path=$HOME/../
-    man_path=/service/vfc/gvnfm/vnflcm/lcm
-    #tab=`mysql -u${MYSQL_USER} -p${MYSQL_PASSWORD} -P${MYSQL_PORT} -h${MYSQL_IP} -e "use vfcnfvolcm; select count(*) from vfcnfvolcm;"`
-    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='gvnfm';"`
-    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='gvnfm';"`
-	tab3=`echo $tab2|awk '{print $2}'`
-        if [ $tab3 -gt 0  ] ; then
-        echo "TABLE CREATE SUCCESSFUL"
-    fi
+if [ $MYSQL_AUTH ]; then
+    MYSQL_ROOT_USER=`echo $MYSQL_AUTH | cut -d: -f 1`
+    MYSQL_ROOT_PASSWORD=`echo $MYSQL_AUTH | cut -d: -f 2`
 else
-    echo "table already existed"
-    exit 1
+    MYSQL_ROOT_USER="root"
+    MYSQL_ROOT_PASSWORD="root"
 fi
- }
 
-if [ ! -f /service/vfc/gvnfm/vnflcm/lcm/docker/db.txt ]; then
-    echo 1 > /service/vfc/gvnfm/vnflcm/lcm/docker/db.txt
-    echo `pwd` >> /service/vfc/gvnfm/vnflcm/lcm/docker/db.txt
+function create_database {
+    cd /service/vfc/gvnfm/vnflcm/lcm/resources/bin
+    bash initDB.sh $MYSQL_ROOT_USER $MYSQL_ROOT_PASSWORD $MYSQL_PORT $MYSQL_IP
+}
+
+function migrate_database {
+    cd /service/vfc/gvnfm/vnflcm/lcm
+    python manage.py makemigrations database
+    python manage.py migrate --fake
+    python manage.py migrate
+}
+
+GET_VNFM_DB="show databases like 'gvnfm';"
+VNFM_DB=`mysql -u$MYSQL_ROOT_USER -p$MYSQL_ROOT_PASSWORD -P$MYSQL_PORT -h$MYSQL_IP -e "$GET_VNFM_DB"`
+if [[ "$VNFM_DB" == "" ]]; then
     create_database
-else
-    echo "database already existed"
+
 fi
+migrate_database