Fix the catalog problem of registering MSB with HTTPS

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

diff --git a/catalog/pub/config/config.py b/catalog/pub/config/config.py
index b8a5141..1c6afb6 100644 (file)
--- a/catalog/pub/config/config.py
+++ b/catalog/pub/config/config.py
@@ -14,7 +14,7 @@
 
 # [MSB]
 MSB_SERVICE_IP = '127.0.0.1'
-MSB_SERVICE_PORT = '80'
+MSB_SERVICE_PORT = '443'
 
 # [REDIS]
 REDIS_HOST = '127.0.0.1'

diff --git a/catalog/pub/utils/restcall.py b/catalog/pub/utils/restcall.py
index 8f03259..1499f8f 100644 (file)
--- a/catalog/pub/utils/restcall.py
+++ b/catalog/pub/utils/restcall.py
@@ -84,13 +84,13 @@ def call_req(base_url, user, passwd, auth_type, resource, method, content='', ad
 
 
 def req_by_msb(resource, method, content=''):
-    base_url = "http://%s:%s/" % (MSB_SERVICE_IP, MSB_SERVICE_PORT)
+    base_url = "https://%s:%s/" % (MSB_SERVICE_IP, MSB_SERVICE_PORT)
     return call_req(base_url, "", "", rest_no_auth, resource, method, content)
 
 
 def upload_by_msb(resource, method, file_data={}):
     headers = {'Content-Type': 'application/octet-stream'}
-    full_url = "http://%s:%s/%s" % (MSB_SERVICE_IP, MSB_SERVICE_PORT, resource)
+    full_url = "https://%s:%s/%s" % (MSB_SERVICE_IP, MSB_SERVICE_PORT, resource)
     http = httplib2.Http()
     resp, resp_content = http.request(full_url, method=method.upper(), body=file_data, headers=headers)
     resp_status, resp_body = resp['status'], resp_content.decode('UTF-8')

diff --git a/catalog/settings.py b/catalog/settings.py
index 51c9a88..4eebb46 100644 (file)
--- a/catalog/settings.py
+++ b/catalog/settings.py
@@ -132,7 +132,7 @@ STATICFILES_DIRS = [
 
 pub_config.CATALOG_ROOT_PATH = os.path.join(STATICFILES_DIRS[0], "catalog")
 pub_config.CATALOG_URL_PATH = "static/catalog"
-pub_config.SDC_BASE_URL = "http://%s:%s/api" % (pub_config.MSB_SERVICE_IP, pub_config.MSB_SERVICE_PORT)
+pub_config.SDC_BASE_URL = "https://%s:%s/api" % (pub_config.MSB_SERVICE_IP, pub_config.MSB_SERVICE_PORT)
 
 if platform.system() == 'Windows' or 'test' in sys.argv:
     LOGGING = {