summaryrefslogtreecommitdiffstats
path: root/nokia/vnfmdriver/vfcadaptorservice
diff options
context:
space:
mode:
authorYan Yang <yangyanyj@chinamobile.com>2017-10-17 00:03:11 +0000
committerGerrit Code Review <gerrit@onap.org>2017-10-17 00:03:11 +0000
commit76d844c78df21f2e382709601d23f67a8efa9e41 (patch)
treed3f24fd9a4f72bac416e41a9fe0f9c3a30be401b /nokia/vnfmdriver/vfcadaptorservice
parent98e2f8c819e72893b25ab233293315a51f5c6895 (diff)
parent8dcd7ce8deacaa20fc5d1889914ba4eeb75ee613 (diff)
Merge "Add annotation"
Diffstat (limited to 'nokia/vnfmdriver/vfcadaptorservice')
-rwxr-xr-xnokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/bin/init_db.sh3
-rwxr-xr-xnokia/vnfmdriver/vfcadaptorservice/docker/init-mysql.sh2
-rwxr-xr-xnokia/vnfmdriver/vfcadaptorservice/docker/instance-init.sh2
-rw-r--r--nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/impl/VnfContinueProcessorImpl.java3
4 files changed, 6 insertions, 4 deletions
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 8b77e28d..e510bfaa 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
@@ -44,10 +44,11 @@ fi
echo
echo "DB-INIT [vnfm_db] : START"
-mysql -u$1 -p$2 -h$3 -P$4 <$(cd `dirname $0`; pwd)/db/mysql/db-schema.sql
+mysql -u$1 -p$2 -h$3 -P$4 <$(cd `dirname $0`; pwd)/db/mysql/db-schema.sql > myout_init_db.file 2>&1
if [ $? != 0 ] ; then
echo "DB-INIT [vnfm_db] : FAILED !"
+ cat myout_init_db.file
exit 1
fi
diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/init-mysql.sh b/nokia/vnfmdriver/vfcadaptorservice/docker/init-mysql.sh
index a11592cf..50fc17f5 100755
--- a/nokia/vnfmdriver/vfcadaptorservice/docker/init-mysql.sh
+++ b/nokia/vnfmdriver/vfcadaptorservice/docker/init-mysql.sh
@@ -17,6 +17,6 @@
# Wait for mysql to initialize; Set mysql root password
echo Initializing mysql
for i in {1..10}; do
- /usr/bin/mysqladmin -u vnfm password 'vnfmpass' &> /dev/null && break
+ /usr/bin/mysqladmin -u root password 'rootpass' &> /dev/null && break
sleep $i
done
diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/instance-init.sh b/nokia/vnfmdriver/vfcadaptorservice/docker/instance-init.sh
index 39e85026..3c1ec6ca 100755
--- a/nokia/vnfmdriver/vfcadaptorservice/docker/instance-init.sh
+++ b/nokia/vnfmdriver/vfcadaptorservice/docker/instance-init.sh
@@ -18,4 +18,4 @@
# Initialize MySQL schema
cd bin
-./init_db.sh vnfm vnfmpass 127.0.0.1 3306
+./init_db.sh root rootpass 127.0.0.1 3306
diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/impl/VnfContinueProcessorImpl.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/impl/VnfContinueProcessorImpl.java
index d5130893..e61323da 100644
--- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/impl/VnfContinueProcessorImpl.java
+++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/impl/VnfContinueProcessorImpl.java
@@ -18,7 +18,6 @@ package org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.impl;
import java.util.concurrent.Executors;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.adaptor.Cbam2DriverResponseConverter;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.adaptor.Driver2CbamRequestConverter;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.adaptor.InstantiateVnfContinueRunnable;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.adaptor.TerminateVnfContinueRunnable;
@@ -29,7 +28,9 @@ import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.inf.NslcmMgmrInf;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.InstantiateVnfRequest;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.TerminateVnfRequest;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.inf.VnfContinueProcessorInf;
+import org.springframework.stereotype.Component;
+@Component
public class VnfContinueProcessorImpl implements VnfContinueProcessorInf{
@Override