From 358611bc1303a4e114ea862a3437947fc2f5caf6 Mon Sep 17 00:00:00 2001 From: yufei_zhou Date: Sat, 30 Sep 2017 16:54:00 +0800 Subject: Modify database part in the deployment Change-Id: I9a058bdfb76b293b740107cb2c11a39fe2387533 Issue-ID: VFC-53 Signed-off-by: yufei_zhou --- .../vfcadaptorservice/deployment/src/main/release/README.txt | 5 +---- .../deployment/src/main/release/bin/init_db.sh | 6 +++--- .../deployment/src/main/release/db/mysql/db-schema.sql | 10 +++++----- 3 files changed, 9 insertions(+), 12 deletions(-) (limited to 'nokia/vnfmdriver/vfcadaptorservice/deployment') diff --git a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/README.txt b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/README.txt index 6681c16a..3ed3afbf 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/README.txt +++ b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/README.txt @@ -16,6 +16,7 @@ Installation steps: - CATALINIA_BASE: Set to the location, where this service installer is unzipped, its optional - PATH: Update it with the location of command 'mysql' + - MSB_ADDR: set Microservices Service Bus address : - In command console, cd to 'bin' directory under the location, where this service installer is unzipped and @@ -27,10 +28,6 @@ Installation steps: Configuration steps: ==================== - Update the db credetials in 'application.properties' under webapps directory. - - Update the MSB address in 'application.properties' under webapps directory. - - Update the VNFM address in 'application.properties' under webapps directory. - - Update the Catalog address in 'application.properties' under webapps directory. - - Update the NSLCM address in 'application.properties' under webapps directory. - Update the MSB address in $PATH/etc/conf/restclient.json - Update the vnfmadapter service ip address in $PATH/etc/adapterInfo/vnfmadapterinfo.json diff --git a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/bin/init_db.sh b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/bin/init_db.sh index 63e7800d..8b77e28d 100755 --- a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/bin/init_db.sh +++ b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/bin/init_db.sh @@ -42,7 +42,7 @@ then fi echo -echo "DB-INIT [vnfmdb] : START" +echo "DB-INIT [vnfm_db] : START" mysql -u$1 -p$2 -h$3 -P$4 <$(cd `dirname $0`; pwd)/db/mysql/db-schema.sql @@ -51,10 +51,10 @@ if [ $? != 0 ] ; then exit 1 fi -echo "DB-INIT [vnfmdb] : PASSED" +echo "DB-INIT [vnfm_db] : PASSED" echo echo "*************************************************************" -echo "CAUTION: Existing vnfmdb will be cleaned before" +echo "CAUTION: Existing vnfm_db will be cleaned before" echo "initializing the schema, so please take a back-up of it" echo "before executing it next time." echo "*************************************************************" diff --git a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/db/mysql/db-schema.sql b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/db/mysql/db-schema.sql index 26252227..1b2b6027 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/db/mysql/db-schema.sql +++ b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/db/mysql/db-schema.sql @@ -24,11 +24,11 @@ FLUSH PRIVILEGES; /******************create new database and user***************************/ create database vnfm_db CHARACTER SET utf8; -GRANT ALL PRIVILEGES ON vnfm_db.* TO 'vnfm'@'%' IDENTIFIED BY 'vnfm' WITH GRANT OPTION; -GRANT ALL PRIVILEGES ON mysql.* TO 'vnfm'@'%' IDENTIFIED BY 'vnfm' WITH GRANT OPTION; +GRANT ALL PRIVILEGES ON vnfm_db.* TO 'vnfm'@'%' IDENTIFIED BY 'vnfmpass' WITH GRANT OPTION; +GRANT ALL PRIVILEGES ON mysql.* TO 'vnfm'@'%' IDENTIFIED BY 'vnfmpass' WITH GRANT OPTION; -GRANT ALL PRIVILEGES ON vnfm_db.* TO 'vnfm'@'localhost' IDENTIFIED BY 'vnfm' WITH GRANT OPTION; -GRANT ALL PRIVILEGES ON mysql.* TO 'vnfm'@'localhost' IDENTIFIED BY 'vnfm' WITH GRANT OPTION; +GRANT ALL PRIVILEGES ON vnfm_db.* TO 'vnfm'@'localhost' IDENTIFIED BY 'vnfmpass' WITH GRANT OPTION; +GRANT ALL PRIVILEGES ON mysql.* TO 'vnfm'@'localhost' IDENTIFIED BY 'vnfmpass' WITH GRANT OPTION; FLUSH PRIVILEGES; use vnfm_db; @@ -47,7 +47,7 @@ CREATE TABLE `vnfm_job_execution_record` ( DROP TABLE IF EXISTS vnfm_resource_record; -CREATE TABLE `vnfm_resource` ( +CREATE TABLE `vnfm_resource_record` ( `id` int(11) auto_increment primary key, `type` enum ('VDU','VL','CP','Storage') DEFAULT NULL, `resourceDefinitionId` varchar(60) DEFAULT NULL, -- cgit 1.2.3-korg