From 4637e303f4c1d65a463a920444a6274af3b78b39 Mon Sep 17 00:00:00 2001 From: GuangrongFu Date: Sat, 2 Sep 2017 12:36:00 +0800 Subject: 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 --- rulemgt-standalone/src/main/assembly/bin/initDB.sh | 2 +- rulemgt-standalone/src/main/assembly/bin/run.sh | 2 +- .../mysql/onap-holmes_rulemgt-createobj.sql | 60 ++++++++++++++++++++++ .../mysql/openo-holmes_rulemgt-createobj.sql | 60 ---------------------- 4 files changed, 62 insertions(+), 62 deletions(-) create mode 100644 rulemgt-standalone/src/main/assembly/dbscripts/mysql/onap-holmes_rulemgt-createobj.sql delete mode 100644 rulemgt-standalone/src/main/assembly/dbscripts/mysql/openo-holmes_rulemgt-createobj.sql 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/onap-holmes_rulemgt-createobj.sql b/rulemgt-standalone/src/main/assembly/dbscripts/mysql/onap-holmes_rulemgt-createobj.sql new file mode 100644 index 0000000..609ec51 --- /dev/null +++ b/rulemgt-standalone/src/main/assembly/dbscripts/mysql/onap-holmes_rulemgt-createobj.sql @@ -0,0 +1,60 @@ +-- +-- Copyright 2017 ZTE Corporation. +-- +-- Licensed under the Apache License, Version 2.0 (the "License"); +-- you may not use this file except in compliance with the License. +-- You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- +/******************drop old database and user***************************/ +use mysql; +drop database IF EXISTS holmes; +delete from user where User='holmes'; +FLUSH PRIVILEGES; + +/******************CREATE NEW DATABASE AND USER***************************/ +create database holmes CHARACTER SET utf8; + +GRANT ALL PRIVILEGES ON holmes.* TO 'holmes'@'%' IDENTIFIED BY 'holmes' WITH GRANT OPTION; +GRANT ALL PRIVILEGES ON mysql.* TO 'holmes'@'%' IDENTIFIED BY 'holmes' WITH GRANT OPTION; + +GRANT ALL PRIVILEGES ON holmes.* TO 'holmes'@'localhost' IDENTIFIED BY 'holmes' WITH GRANT OPTION; +GRANT ALL PRIVILEGES ON mysql.* TO 'holmes'@'localhost' IDENTIFIED BY 'holmes' WITH GRANT OPTION; +FLUSH PRIVILEGES; + +use holmes; +set Names 'utf8'; +/******************DELETE OLD TABLE AND CREATE NEW***************************/ +use holmes; +DROP TABLE IF EXISTS APLUS_RULE; +CREATE TABLE APLUS_RULE ( + RID VARCHAR(30) NOT NULL, + NAME VARCHAR(150) NOT NULL, + DESCRIPTION VARCHAR(4000) NULL, + ENABLE INT(1) NOT NULL, + TEMPLATEID INT(10) NOT NULL, + ENGINEID VARCHAR(20) NOT NULL, + ENGINETYPE VARCHAR(20) NOT NULL, + CREATOR VARCHAR(20) NOT NULL, + CREATETIME DATETIME NOT NULL, + UPDATOR VARCHAR(20) NULL, + UPDATETIME DATETIME NULL, + PARAMS VARCHAR(4000) NULL, + CONTENT VARCHAR(4000) NOT NULL, + VENDOR VARCHAR(100) NOT NULL, + PACKAGE VARCHAR(255) NULL, + PRIMARY KEY (RID), + UNIQUE KEY NAME (NAME), + KEY IDX_APLUS_RULE_ENABLE (ENABLE), + KEY IDX_APLUS_RULE_TEMPLATEID (TEMPLATEID), + KEY IDX_APLUS_RULE_ENGINEID (ENGINEID), + KEY IDX_APLUS_RULE_ENGINETYPE (ENGINETYPE) +); + diff --git a/rulemgt-standalone/src/main/assembly/dbscripts/mysql/openo-holmes_rulemgt-createobj.sql b/rulemgt-standalone/src/main/assembly/dbscripts/mysql/openo-holmes_rulemgt-createobj.sql deleted file mode 100644 index 609ec51..0000000 --- a/rulemgt-standalone/src/main/assembly/dbscripts/mysql/openo-holmes_rulemgt-createobj.sql +++ /dev/null @@ -1,60 +0,0 @@ --- --- Copyright 2017 ZTE Corporation. --- --- Licensed under the Apache License, Version 2.0 (the "License"); --- you may not use this file except in compliance with the License. --- You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- -/******************drop old database and user***************************/ -use mysql; -drop database IF EXISTS holmes; -delete from user where User='holmes'; -FLUSH PRIVILEGES; - -/******************CREATE NEW DATABASE AND USER***************************/ -create database holmes CHARACTER SET utf8; - -GRANT ALL PRIVILEGES ON holmes.* TO 'holmes'@'%' IDENTIFIED BY 'holmes' WITH GRANT OPTION; -GRANT ALL PRIVILEGES ON mysql.* TO 'holmes'@'%' IDENTIFIED BY 'holmes' WITH GRANT OPTION; - -GRANT ALL PRIVILEGES ON holmes.* TO 'holmes'@'localhost' IDENTIFIED BY 'holmes' WITH GRANT OPTION; -GRANT ALL PRIVILEGES ON mysql.* TO 'holmes'@'localhost' IDENTIFIED BY 'holmes' WITH GRANT OPTION; -FLUSH PRIVILEGES; - -use holmes; -set Names 'utf8'; -/******************DELETE OLD TABLE AND CREATE NEW***************************/ -use holmes; -DROP TABLE IF EXISTS APLUS_RULE; -CREATE TABLE APLUS_RULE ( - RID VARCHAR(30) NOT NULL, - NAME VARCHAR(150) NOT NULL, - DESCRIPTION VARCHAR(4000) NULL, - ENABLE INT(1) NOT NULL, - TEMPLATEID INT(10) NOT NULL, - ENGINEID VARCHAR(20) NOT NULL, - ENGINETYPE VARCHAR(20) NOT NULL, - CREATOR VARCHAR(20) NOT NULL, - CREATETIME DATETIME NOT NULL, - UPDATOR VARCHAR(20) NULL, - UPDATETIME DATETIME NULL, - PARAMS VARCHAR(4000) NULL, - CONTENT VARCHAR(4000) NOT NULL, - VENDOR VARCHAR(100) NOT NULL, - PACKAGE VARCHAR(255) NULL, - PRIMARY KEY (RID), - UNIQUE KEY NAME (NAME), - KEY IDX_APLUS_RULE_ENABLE (ENABLE), - KEY IDX_APLUS_RULE_TEMPLATEID (TEMPLATEID), - KEY IDX_APLUS_RULE_ENGINEID (ENGINEID), - KEY IDX_APLUS_RULE_ENGINETYPE (ENGINETYPE) -); - -- cgit 1.2.3-korg