Update vnfres docker build function name

Change-Id: I7b1b4648257aa8d4501d840f55c5cc1d6b9f1e4a
Issue-ID: VFC-289
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>

diff --git a/res/docker/Dockerfile b/res/docker/Dockerfile
index 920fda5..8c7f8e6 100644 (file)
--- a/res/docker/Dockerfile
+++ b/res/docker/Dockerfile
@@ -30,7 +30,7 @@ RUN apt-get update && \
 ADD . /service
 WORKDIR /service
 
-# get binary zip from nexus - vfc-nfvo-lcm
+# get binary zip from nexus
 RUN wget -q -O vfc-gvnfm-vnfres.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.gvnfm.vnfres&a=vfc-gvnfm-vnfres-res&v=LATEST&e=zip' && \
     unzip vfc-gvnfm-vnfres.zip && \
     rm -rf vfc-gvnfm-vnfres.zip

diff --git a/res/docker/build_image.sh b/res/docker/build_image.sh
index 55eaeb9..246cef7 100644 (file)
--- a/res/docker/build_image.sh
+++ b/res/docker/build_image.sh
@@ -19,16 +19,16 @@ if [ $HTTPS_PROXY ]; then
     BUILD_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}"
 fi
 
-function build_vnfres {
+function build_image {
     echo "Start build docker image: ${IMAGE_NAME}"
     docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION} -t ${IMAGE_NAME}:latest .
 }
 
-function push_vnfres {
+function push_image {
     echo "Start push docker image: ${IMAGE_NAME}"
     docker push ${IMAGE_NAME}:${VERSION}
     docker push ${IMAGE_NAME}:latest
 }
 
-build_vnfres
-push_vnfres
+build_image
+push_image

diff --git a/res/docker/docker-entrypoint.sh b/res/docker/docker-entrypoint.sh
index 1721831..214ae15 100644 (file)
--- a/res/docker/docker-entrypoint.sh
+++ b/res/docker/docker-entrypoint.sh
@@ -18,7 +18,7 @@ echo "MSB_ADDR=$MSB_ADDR"
 
 # Wait for MSB initialization
 echo "Wait for MSB initialization"
-for i in {1..20}; do
+for i in {1..5}; do
     curl -sS -m 1 $MSB_ADDR > /dev/null && break
     sleep $i
 done

diff --git a/res/res/pub/config/config.py b/res/res/pub/config/config.py
index 86701be..d0ec0c2 100644 (file)
--- a/res/res/pub/config/config.py
+++ b/res/res/pub/config/config.py
@@ -25,9 +25,9 @@ REDIS_PASSWD = ''
 # [mysql]
 DB_IP = "127.0.0.1"
 DB_PORT = 3306
-DB_NAME = "gvnfm"
-DB_USER = "gvnfm"
-DB_PASSWD = "gvnfm"
+DB_NAME = "vfcvnfres"
+DB_USER = "vfcvnfres"
+DB_PASSWD = "vfcvnfres"
 
 # [register]
 REG_TO_MSB_WHEN_START = True