diff options
| author |   yangyan <yangyanyj@chinamobile.com> | 2020-01-14 15:17:48 +0800 |
|---|---|---|
| committer | yangyan <yangyanyj@chinamobile.com> | 2020-01-15 09:19:50 +0800 |
| commit | 5e8187168dbd803b95c9bd4cdcf8d987bc1fa19b (patch) | |
| tree | 51173059e38d1fb5f951527e8ce872635e84466e | |
| parent | 8881c2454033bdc41485bc6837069fe1a0882b95 (diff) | |
Fix the nslcm problem of registering MSB with HTTPS
Change-Id: I27bacdca8307b10aa98256c1c0609b3afe5f44bd
Issue-ID: VFC-1502
Signed-off-by: yangyan <yangyanyj@chinamobile.com>
| -rw-r--r-- | lcm/ns_vnfs/biz/subscribe.py | 2 | ||||
| -rw-r--r-- | lcm/pub/config/config.py | 4 | ||||
| -rw-r--r-- | lcm/pub/utils/restcall.py | 6 | ||||
| -rw-r--r-- | lcm/settings.py | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/lcm/ns_vnfs/biz/subscribe.py b/lcm/ns_vnfs/biz/subscribe.py index 40f40591..af375a52 100644 --- a/lcm/ns_vnfs/biz/subscribe.py +++ b/lcm/ns_vnfs/biz/subscribe.py @@ -42,7 +42,7 @@ class SubscriptionCreation(object): def prepare_lccn_subscription_request_data(self): vnfm_info = get_vnfm_by_id(self.vnfm_id) - call_back = "http://%s:%s/api/gvnfmdriver/v1/vnfs/lifecyclechangesnotification" % (pub_config.MSB_SERVICE_IP, pub_config.MSB_SERVICE_PORT) + call_back = "%s/api/gvnfmdriver/v1/vnfs/lifecyclechangesnotification" % pub_config.MSB_BASE_URL self.subscription_request_data = { "filter": { "notificationTypes": ["VnfLcmOperationOccurrenceNotification"], diff --git a/lcm/pub/config/config.py b/lcm/pub/config/config.py index a02d4bac..f97f1c00 100644 --- a/lcm/pub/config/config.py +++ b/lcm/pub/config/config.py @@ -14,8 +14,8 @@ # [MSB] MSB_SERVICE_IP = '10.0.14.1' -MSB_SERVICE_PORT = '80' -MSB_BASE_URL = "http://%s:%s" % (MSB_SERVICE_IP, MSB_SERVICE_PORT) +MSB_SERVICE_PORT = '30283' +MSB_BASE_URL = "https://%s:%s" % (MSB_SERVICE_IP, MSB_SERVICE_PORT) # [REDIS] REDIS_HOST = '127.0.0.1' diff --git a/lcm/pub/utils/restcall.py b/lcm/pub/utils/restcall.py index 9fd81601..b2f14e3c 100644 --- a/lcm/pub/utils/restcall.py +++ b/lcm/pub/utils/restcall.py @@ -23,7 +23,7 @@ import uuid import httplib2 import requests -from lcm.pub.config.config import MSB_SERVICE_IP, MSB_SERVICE_PORT +from lcm.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' @@ -90,13 +90,13 @@ def call_req(base_url, user, passwd, auth_type, resource, method, content='', ad def req_by_msb(resource, method, content=''): logger.debug("resource: %s, method: %s, content: %s" % (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) def upload_by_msb(resource, method, file_data): headers = {'accept': 'application/json'} - full_url = "http://%s:%s/%s" % (MSB_SERVICE_IP, MSB_SERVICE_PORT, resource) + full_url = "%s/%s" % (MSB_BASE_URL, resource) r = requests.post(full_url, files=file_data, headers=headers) resp_status, resp_body = str(r.status_code), r.text if resp_status not in status_ok_list: diff --git a/lcm/settings.py b/lcm/settings.py index 18a5932c..08006c4d 100644 --- a/lcm/settings.py +++ b/lcm/settings.py @@ -133,8 +133,8 @@ TIME_ZONE = 'UTC' STATIC_URL = '/static/' -pub_config.AAI_BASE_URL = "http://%s:%s/aai/v11" % (pub_config.MSB_SERVICE_IP, pub_config.MSB_SERVICE_PORT) -pub_config.SDC_BASE_URL = "http://%s:%s/api" % (pub_config.MSB_SERVICE_IP, pub_config.MSB_SERVICE_PORT) +pub_config.AAI_BASE_URL = "%s/aai/v11" % pub_config.MSB_BASE_URL +pub_config.SDC_BASE_URL = "%s/api" % pub_config.MSB_BASE_URL if platform.system() == 'Windows' or 'test' in sys.argv: LOGGING = { |