From: tangpeng <tang.peng5@zte.com.cn>
Date: Tue, 28 Feb 2017 06:20:55 +0000 (+0800)
Subject: Modify engine database script
X-Git-Tag: release/mercury~21
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=holmes%2Fengine-management.git;a=commitdiff_plain;h=affe52530aecd15cb0ae1efb70df840651d968ff

Modify engine database script

Change-Id: Idcb64f57c228aac8b8d708172292782ce045c801
Issue-ID:HOLMES-47
Signed-off-by: tangpeng <tang.peng5@zte.com.cn>
---

diff --git a/engine-d-standalone/src/main/assembly/conf/engine-d.yml b/engine-d-standalone/src/main/assembly/conf/engine-d.yml
index 5fce4b8..3a11fcb 100644
--- a/engine-d-standalone/src/main/assembly/conf/engine-d.yml
+++ b/engine-d-standalone/src/main/assembly/conf/engine-d.yml
@@ -51,9 +51,8 @@ logging:
 database:
   driverClass: com.mysql.jdbc.Driver
   user: root
-  password: root321
-#  url: jdbc:mysql://${db_ip}:${db_port}/mysql?useUnicode=relationtesttrue&characterEncoding=UTF8
-  url: jdbc:mysql://10.74.156.206:3306/mysql?useUnicode=true&characterEncoding=UTF8
+  password: rootpass
+  url: jdbc:mysql://10.74.156.206:3306/holmes
   properties:
     charSet: UTF-8
   maxWaitForConnection: 1s
diff --git a/engine-d-standalone/src/main/assembly/dbscripts/mysql/openo-holmes_engine_d-createobj.sql b/engine-d-standalone/src/main/assembly/dbscripts/mysql/openo-holmes_engine_d-createobj.sql
index 73d51ee..e69de29 100644
--- a/engine-d-standalone/src/main/assembly/dbscripts/mysql/openo-holmes_engine_d-createobj.sql
+++ b/engine-d-standalone/src/main/assembly/dbscripts/mysql/openo-holmes_engine_d-createobj.sql
@@ -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 catalog.* 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) CHARACTER NOT NULL,
-  description varchar(4000) CHARACTER SET  DEFAULT NULL,
-  enable int(1) NOT NULL,
-  templateID int(10) NOT NULL,
-  engineID varchar(20) CHARACTER  NOT NULL,
-  engineType varchar(20) CHARACTER  NOT NULL,
-  creator varchar(20) CHARACTER  NOT NULL,
-  createTime datetime NOT NULL,
-  updator varchar(20) CHARACTER  DEFAULT NULL,
-  updateTime datetime DEFAULT NULL,
-  params varchar(4000) CHARACTER  DEFAULT NULL,
-  content varchar(4000) CHARACTER  NOT NULL,
-  vendor varchar(100) CHARACTER  NOT NULL,
-  package varchar(255) DEFAULT 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/engine-d/pom.xml b/engine-d/pom.xml
index 7075c2d..9176aa0 100644
--- a/engine-d/pom.xml
+++ b/engine-d/pom.xml
@@ -53,6 +53,7 @@
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.drools</groupId>
@@ -148,6 +149,8 @@
             <version>1.6.5</version>
             <scope>test</scope>
         </dependency>
+
+
     </dependencies>
 
     <build>