import uuid
import httplib2
import base64
+import codecs
from multivimbroker.pub.config.config import AAI_SCHEMA_VERSION
from multivimbroker.pub.config.config import AAI_SERVICE_URL
from multivimbroker.pub.config.config import AAI_USERNAME
from multivimbroker.pub.config.config import AAI_PASSWORD
+from multivimbroker.pub.config.config import MSB_SERVICE_PROTOCOL
from multivimbroker.pub.config.config import MSB_SERVICE_IP, MSB_SERVICE_PORT
rest_no_auth, rest_oneway_auth, rest_bothway_auth = 0, 1, 2
resp, resp_content = http.request(
full_url, method=method.upper(),
body=content, headers=headers)
- resp_status, resp_body = resp['status'], resp_content
+ resp_status, resp_body = resp['status'], codecs.decode(
+ resp_content, 'UTF-8') if resp_content else None
if resp_status in status_ok_list:
ret = [0, resp_body, resp_status, resp]
def req_by_msb(resource, method, content='', headers=None):
- base_url = "http://%s:%s/" % (MSB_SERVICE_IP, MSB_SERVICE_PORT)
+ base_url = "%s://%s:%s/" % (
+ MSB_SERVICE_PROTOCOL, MSB_SERVICE_IP, MSB_SERVICE_PORT)
return call_req(base_url, "", "",
rest_no_auth, resource, method, content, headers)
def req_by_msb_multipart(resource, method, content, headers=None):
- base_url = "http://%s:%s/" % (MSB_SERVICE_IP, MSB_SERVICE_PORT)
+ base_url = "%s://%s:%s/" % (
+ MSB_SERVICE_PROTOCOL, MSB_SERVICE_IP, MSB_SERVICE_PORT)
return call_multipart_req(base_url, "", "",
rest_no_auth, resource, method, content, headers)