Modify the request by msb with https

Change-Id: Ifff96f74c11cc8407c9428f2342a81e5a1db8de4
Issue-ID: VFC-1602
Signed-off-by: yangyan <yangyanyj@chinamobile.com>

diff --git a/docker/instance_config.sh b/docker/instance_config.sh
index 70a3cc6..9b59331 100755 (executable)
--- a/docker/instance_config.sh
+++ b/docker/instance_config.sh
@@ -1,5 +1,6 @@
 #!/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`
 
@@ -12,6 +13,10 @@ 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/lcm/lcm/pub/config/config.py
 fi
 
+if [ $MSB_PROTO ]; then
+    sed -i "s|MSB_SERVICE_PROTOCOL = .*|MSB_SERVICE_PROTOCOL = '$MSB_PROTO'|" vfc/nfvo/lcm/lcm/pub/config/config.py
+fi
+
 if [ $MSB_IP ]; then
     sed -i "s|MSB_SERVICE_IP = .*|MSB_SERVICE_IP = '$MSB_IP'|" vfc/nfvo/lcm/lcm/pub/config/config.py
 fi

diff --git a/lcm/pub/config/config.py b/lcm/pub/config/config.py
index f97f1c0..d453480 100644 (file)
--- a/lcm/pub/config/config.py
+++ b/lcm/pub/config/config.py
@@ -13,9 +13,10 @@
 # limitations under the License.
 
 # [MSB]
+MSB_SERVICE_PROTOCOL = 'http'
 MSB_SERVICE_IP = '10.0.14.1'
-MSB_SERVICE_PORT = '30283'
-MSB_BASE_URL = "https://%s:%s" % (MSB_SERVICE_IP, MSB_SERVICE_PORT)
+MSB_SERVICE_PORT = '443'
+MSB_BASE_URL = "%s://%s:%s" % (MSB_SERVICE_PROTOCOL, MSB_SERVICE_IP, MSB_SERVICE_PORT)
 
 # [REDIS]
 REDIS_HOST = '127.0.0.1'