diff options
Diffstat (limited to 'catalog/pub/utils/restcall.py')
| -rw-r--r-- | catalog/pub/utils/restcall.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/catalog/pub/utils/restcall.py b/catalog/pub/utils/restcall.py index 1499f8f0..f4493eaa 100644 --- a/catalog/pub/utils/restcall.py +++ b/catalog/pub/utils/restcall.py @@ -20,7 +20,7 @@ import uuid import httplib2 import base64 -from catalog.pub.config.config import MSB_SERVICE_IP, MSB_SERVICE_PORT +from catalog.pub.config.config import MSB_SERVICE_IP, MSB_SERVICE_PORT, MSB_BASE_URL, MSB_SERVICE_PROTOCOL 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' @@ -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 = "https://%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 = {'Content-Type': 'application/octet-stream'} - full_url = "https://%s:%s/%s" % (MSB_SERVICE_IP, MSB_SERVICE_PORT, resource) + full_url = "%s://%s:%s/%s" % (MSB_SERVICE_PROTOCOL, 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') |