From: GuangrongFu <fu.guangrong@zte.com.cn>
Date: Sat, 2 Sep 2017 04:36:00 +0000 (+0800)
Subject: Fix the DB Init Problem
X-Git-Tag: v1.0.0~64
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=4637e303f4c1d65a463a920444a6274af3b78b39;p=holmes%2Frule-management.git

Fix the DB Init Problem

Change the main path of the DB script file.
Change the IP addr of the DB.
Rename the DB script file from openo to onap.

Change-Id: I2b8d428877453dac46c1156b37eeb75c019ea631
Issue-ID: HOLMES-39
Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
---

diff --git a/rulemgt-standalone/src/main/assembly/bin/initDB.sh b/rulemgt-standalone/src/main/assembly/bin/initDB.sh
index a602bf9..6ec9947 100644
--- a/rulemgt-standalone/src/main/assembly/bin/initDB.sh
+++ b/rulemgt-standalone/src/main/assembly/bin/initDB.sh
@@ -22,7 +22,7 @@ password=$2
 port=$3
 host=$4
 echo "start init holmes rulemgt db"
-main_path=$HOME/../
+main_path=$HOME/..
 cat $main_path/dbscripts/mysql/onap-holmes_rulemgt-createobj.sql
 echo "user="$user
 echo "password"$password
diff --git a/rulemgt-standalone/src/main/assembly/bin/run.sh b/rulemgt-standalone/src/main/assembly/bin/run.sh
index ea98482..143fbec 100644
--- a/rulemgt-standalone/src/main/assembly/bin/run.sh
+++ b/rulemgt-standalone/src/main/assembly/bin/run.sh
@@ -34,7 +34,7 @@ echo @class_path@ $class_path
 sed -i "s|url:.*|url: jdbc:mysql://$URL_JDBC/holmes|" "$main_path/conf/rulemgt.yml"
 sed -i "s|msbServerAddr:.*|msbServerAddr: http://$MSB_ADDR|" "$main_path/conf/rulemgt.yml"
 
-./initDB.sh root rootpass 3306 `${URL_JDBC%:*}`
+./bin/initDB.sh root rootpass 3306 "${URL_JDBC%:*}"
 
 "$JAVA" $JAVA_OPTS -classpath "$class_path" org.onap.holmes.rulemgt.RuleActiveApp server "$main_path/conf/rulemgt.yml"
 
diff --git a/rulemgt-standalone/src/main/assembly/dbscripts/mysql/openo-holmes_rulemgt-createobj.sql b/rulemgt-standalone/src/main/assembly/dbscripts/mysql/onap-holmes_rulemgt-createobj.sql
similarity index 100%
rename from rulemgt-standalone/src/main/assembly/dbscripts/mysql/openo-holmes_rulemgt-createobj.sql
rename to rulemgt-standalone/src/main/assembly/dbscripts/mysql/onap-holmes_rulemgt-createobj.sql