From 9310b420a3dd5860c6e4bca27f1c614fe6074c47 Mon Sep 17 00:00:00 2001
From: dyh <dengyuanhong@chinamobile.com>
Date: Fri, 7 Aug 2020 18:00:32 +0800
Subject: Don't modify the config file with sed in the docker entrypoint script

Change-Id: I6c8c927b9d2f61d2d490405346f6e35aaf4d3523
Issue-ID: VFC-1623
Signed-off-by: dyh <dengyuanhong@chinamobile.com>
---
 gvnfmadapter/docker/docker-entrypoint.sh | 25 ++-----------------------
 gvnfmadapter/docker/instance_config.sh   | 31 -------------------------------
 gvnfmadapter/driver/pub/config/config.py | 18 +++++++-----------
 3 files changed, 9 insertions(+), 65 deletions(-)
 delete mode 100755 gvnfmadapter/docker/instance_config.sh

diff --git a/gvnfmadapter/docker/docker-entrypoint.sh b/gvnfmadapter/docker/docker-entrypoint.sh
index d89ef2e..0b79ef5 100755
--- a/gvnfmadapter/docker/docker-entrypoint.sh
+++ b/gvnfmadapter/docker/docker-entrypoint.sh
@@ -1,29 +1,8 @@
 #!/bin/bash
 
-if [ -z "$SERVICE_IP" ]; then
-    export SERVICE_IP=`hostname -i`
-fi
-echo "SERVICE_IP=$SERVICE_IP"
-
-if [ -z "$MSB_ADDR" ]; then
-    echo "Missing required variable MSB_ADDR: Microservices Service Bus address <ip>:<port>"
-    exit 1
-fi
-echo "MSB_ADDR=$MSB_ADDR"
-
-# Wait for MSB initialization
-echo "Wait for MSB initialization"
-for i in {1..5}; do
-    curl -sS -m 1 $MSB_PROTO://$MSB_ADDR/msb -k > /dev/null
-    res=$?
-    if [ $res -ne 0 ]; then
-        break
-    fi
-    sleep $i
-done
-
 # Configure service based on docker environment variables
-vfc/nfvo/driver/vnfm/gvnfm/gvnfmadapter/docker/instance_config.sh
+python vfc/nfvo/driver/vnfm/gvnfm/gvnfmadapter/driver/pub/config.py
+cat vfc/nfvo/driver/vnfm/gvnfm/gvnfmadapter/driver/pub/config.py
 
 # microservice-specific one-time initialization
 vfc/nfvo/driver/vnfm/gvnfm/gvnfmadapter/docker/instance_init.sh
diff --git a/gvnfmadapter/docker/instance_config.sh b/gvnfmadapter/docker/instance_config.sh
deleted file mode 100755
index 2f45eee..0000000
--- a/gvnfmadapter/docker/instance_config.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-MSB_PROTO=`echo $MSB_PROTO`
-MSB_IP=`echo $MSB_ADDR | cut -d: -f 1`
-MSB_PORT=`echo $MSB_ADDR | cut -d: -f 2`
-
-if [ $REG_TO_MSB_WHEN_START ]; then
-    sed -i "s|REG_TO_MSB_WHEN_START = .*|REG_TO_MSB_WHEN_START = '$REG_TO_MSB_WHEN_START'|" vfc/nfvo/driver/vnfm/gvnfm/gvnfmadapter/driver/pub/config/config.py
-fi
-
-if [ $MSB_IP ]; then
-    sed -i "s|MSB_SERVICE_IP = .*|MSB_SERVICE_IP = '$MSB_IP'|" vfc/nfvo/driver/vnfm/gvnfm/gvnfmadapter/driver/pub/config/config.py
-fi
-
-if [ $MSB_PROTO ]; then
-    sed -i "s|MSB_SERVICE_PROTOCOL = .*|MSB_SERVICE_PROTOCOL = '$MSB_PROTO'|" vfc/nfvo/driver/vnfm/gvnfm/gvnfmadapter/driver/pub/config/config.py
-fi
-
-if [ $MSB_PORT ]; then
-    sed -i "s|MSB_SERVICE_PORT = .*|MSB_SERVICE_PORT = '$MSB_PORT'|" vfc/nfvo/driver/vnfm/gvnfm/gvnfmadapter/driver/pub/config/config.py
-fi
-
-if [ $SERVICE_IP ]; then
-    sed -i "s|\"ip\": \".*\"|\"ip\": \"$SERVICE_IP\"|" vfc/nfvo/driver/vnfm/gvnfm/gvnfmadapter/driver/pub/config/config.py
-fi
-
-if [ $SSL_ENABLED ]; then
-    sed -i "s|SSL_ENABLED = .*|SSL_ENABLED = '$SSL_ENABLED'|"  vfc/nfvo/driver/vnfm/gvnfm/gvnfmadapter/driver/pub/config/config.py
-fi
-
-cat vfc/nfvo/driver/vnfm/gvnfm/gvnfmadapter/driver/pub/config/config.py
diff --git a/gvnfmadapter/driver/pub/config/config.py b/gvnfmadapter/driver/pub/config/config.py
index 44fc5ce..c9e1e60 100644
--- a/gvnfmadapter/driver/pub/config/config.py
+++ b/gvnfmadapter/driver/pub/config/config.py
@@ -12,11 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
+
 # [MSB]
-MSB_SERVICE_PROTOCOL = 'http'
-MSB_SERVICE_IP = '127.0.0.1'
-MSB_SERVICE_PORT = '443'
-MSB_BASE_URL = "%s://%s:%s" % (MSB_SERVICE_PROTOCOL, MSB_SERVICE_IP, MSB_SERVICE_PORT)
+MSB_BASE_URL = os.getenv("MSB_HOST", "http://127.0.0.1:80")
+MSB_ENABLED = os.getenv("MSB_ENABLED", True)
 
 # [MDC]
 SERVICE_NAME = "gvnfmdriver"
@@ -24,17 +24,13 @@ FORWARDED_FOR_FIELDS = ["HTTP_X_FORWARDED_FOR", "HTTP_X_FORWARDED_HOST",
                         "HTTP_X_FORWARDED_SERVER"]
 
 # [register]
-REG_TO_MSB_WHEN_START = True
-SSL_ENABLED = "true"
+REG_TO_MSB_WHEN_START = os.getenv("REG_TO_MSB_WHEN_START", "false")
+SSL_ENABLED = os.getenv("SSL_ENABLED", "false")
 REG_TO_MSB_REG_URL = "/api/microservices/v1/services"
-if SSL_ENABLED == "true":
-    enable_ssl = "true"
-else:
-    enable_ssl = "false"
 REG_TO_MSB_REG_PARAM = {
     "serviceName": "gvnfmdriver",
     "version": "v1",
-    "enable_ssl": enable_ssl,
+    "enable_ssl": SSL_ENABLED,
     "url": "/api/gvnfmdriver/v1",
     "protocol": "REST",
     "visualRange": "1",
-- 
cgit 1.2.3-korg