X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Fdocker%2Finstance_init.sh;h=9103bd349874ca3932e093e88a3668af678bf8e8;hb=538fbfef0c2b0c050fb2ae7d60990271bbf029e3;hp=aa6a2d63ae128c4b1e88c3ad011b85ff0934c044;hpb=a76e4c259dca7d4af1a5245413666062469f272e;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/docker/instance_init.sh b/lcm/docker/instance_init.sh
index aa6a2d63..9103bd34 100755
--- a/lcm/docker/instance_init.sh
+++ b/lcm/docker/instance_init.sh
@@ -1,54 +1,25 @@
 #!/bin/bash
 
-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
+MYSQL_IP=`echo $MYSQL_ADDR | cut -d: -f 1`
+MYSQL_PORT=`echo $MYSQL_ADDR | cut -d: -f 2`
 
-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
+if [ $MYSQL_ROOT_USER ] && [ $MYSQL_ROOT_PASSWORD ]; then
+    MYSQL_ROOT_USER=$MYSQL_ROOT_USER
+    MYSQL_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD
 else
-    echo >/var/log/onap/vfc/gvnfm-vnflcm/runtime_lcm.log
+    MYSQL_ROOT_USER="root"
+    MYSQL_ROOT_PASSWORD="root"
 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
-
-    man_path=/service/vfc/gvnfm/vnflcm/lcm
+    bash initDB.sh $MYSQL_ROOT_USER $MYSQL_ROOT_PASSWORD $MYSQL_PORT $MYSQL_IP
+}
 
-    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}'`
+function migrate_database {
+    cd /service/vfc/gvnfm/vnflcm/lcm
+    python manage.py migrate
+}
 
-    if [ $tab1 -eq 0 ] ; then
-
-        echo "TABLE NOT EXISTS, START MIGRATE"
-        python $man_path/manage.py makemigrations database && python $man_path/manage.py migrate database &
-        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
-else
-    echo "table already existed"
-    exit 1
-fi
- }
-
-if [ ! -f /service/vfc/gvnfm/vnflcm/lcm/docker/db.txt ]; then
-    echo 1 > /service/vfc/gvnfm/vnflcm/lcm/docker/db.txt
-
-    create_database
-else
-    echo "database already existed"
-fi
+create_database
+migrate_database