diff options
| author |   yangyan <yangyanyj@chinamobile.com> | 2020-02-18 08:53:02 +0800 |
|---|---|---|
| committer | Yan Yang <yangyanyj@chinamobile.com> | 2020-02-18 00:55:24 +0000 |
| commit | 275dd81783aef1e73a59d13788d37d6395430e0f (patch) | |
| tree | 27a7d28c55eb188e236b8f30869df2279a6423fc | |
| parent | c4b01de0f133e8267f41e21ea3b7e9373fdbbdff (diff) | |
Modify the request by msb with https
Change-Id: I1039e8a4a03a15c5548a91ba1f018d1e7d4d57b5
Issue-ID: VFC-1602
Signed-off-by: yangyan <yangyanyj@chinamobile.com>
| -rwxr-xr-x | mgr/docker/docker-entrypoint.sh | 6 | ||||
| -rwxr-xr-x | mgr/docker/instance_config.sh | 5 | ||||
| -rw-r--r-- | mgr/mgr/pub/config/config.py | 4 | ||||
| -rw-r--r-- | mgr/mgr/pub/utils/restcall.py | 4 |
4 files changed, 15 insertions, 4 deletions
diff --git a/mgr/docker/docker-entrypoint.sh b/mgr/docker/docker-entrypoint.sh index ecdd938..55e6890 100755 --- a/mgr/docker/docker-entrypoint.sh +++ b/mgr/docker/docker-entrypoint.sh @@ -20,7 +20,11 @@ echo "MYSQL_ADDR=$MYSQL_ADDR" # Wait for MSB initialization echo "Wait for MSB initialization" for i in {1..5}; do - curl -sS -m 1 $MSB_ADDR > /dev/null && break + curl -sS -m 1 $MSB_PROTO:$MSB_ADDR/msb -k > /dev/null + res=$i? + if [ $res -ne 0 ]; then + break + fi sleep $i done diff --git a/mgr/docker/instance_config.sh b/mgr/docker/instance_config.sh index 02024d4..3259f48 100755 --- a/mgr/docker/instance_config.sh +++ b/mgr/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` @@ -7,6 +8,10 @@ if [ $MSB_IP ]; then sed -i "s|MSB_SERVICE_IP.*|MSB_SERVICE_IP = '$MSB_IP'|" vfc/gvnfm/vnfmgr/mgr/mgr/pub/config/config.py fi +if [ $MSB_PROTO ]; then + sed -i "s|MSB_SERVICE_PROTOCOL = .*|MSB_SERVICE_PROTOCOL = '$MSB_PROTO'|" vfc/gvnfm/vnfmgr/mgr/mgr/pub/config/config.py +fi + if [ $MSB_PORT ]; then sed -i "s|MSB_SERVICE_PORT.*|MSB_SERVICE_PORT = '$MSB_PORT'|" vfc/gvnfm/vnfmgr/mgr/mgr/pub/config/config.py fi diff --git a/mgr/mgr/pub/config/config.py b/mgr/mgr/pub/config/config.py index 3eb285e..c67effd 100644 --- a/mgr/mgr/pub/config/config.py +++ b/mgr/mgr/pub/config/config.py @@ -13,8 +13,10 @@ # limitations under the License. # [MSB] +MSB_SERVICE_PROTOCOL = 'http' MSB_SERVICE_IP = '127.0.0.1' -MSB_SERVICE_PORT = '80' +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' diff --git a/mgr/mgr/pub/utils/restcall.py b/mgr/mgr/pub/utils/restcall.py index 567361b..e37156d 100644 --- a/mgr/mgr/pub/utils/restcall.py +++ b/mgr/mgr/pub/utils/restcall.py @@ -20,7 +20,7 @@ import urllib import uuid import httplib2 -from mgr.pub.config.config import MSB_SERVICE_IP, MSB_SERVICE_PORT +from mgr.pub.config.config import MSB_BASE_URL rest_no_auth, rest_oneway_auth, rest_bothway_auth = 0, 1, 2 HTTP_200_OK, HTTP_201_CREATED, HTTP_204_NO_CONTENT, HTTP_202_ACCEPTED = '200', '201', '204', '202' @@ -77,7 +77,7 @@ def call_req(base_url, user, passwd, auth_type, resource, method, content=''): def req_by_msb(resource, method, content=''): - base_url = "http://%s:%s/" % (MSB_SERVICE_IP, MSB_SERVICE_PORT) + base_url = MSB_BASE_URL return call_req(base_url, "", "", rest_no_auth, resource, method, content) |