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 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_IP, MSB_SERVICE_PORT
rest_no_auth, rest_oneway_auth, rest_bothway_auth = 0, 1, 2
from multivimbroker.pub.config.config import MSB_SERVICE_IP, MSB_SERVICE_PORT
rest_no_auth, rest_oneway_auth, rest_bothway_auth = 0, 1, 2
try:
full_url = combine_url(base_url, resource)
logger.debug("request=%s)" % full_url)
try:
full_url = combine_url(base_url, resource)
logger.debug("request=%s)" % full_url)
- requestObj = urllib2.Request(full_url, content,
- headers)
- resp = urllib2.urlopen(requestObj)
+ requestObj = urllib.request.Request(full_url, content, headers)
+ resp = urllib.request.urlopen(requestObj)
if resp.code in status_ok_list:
ret = [0, resp.read(), resp.code, resp]
else:
ret = [1, resp.read(), resp.code, resp]
if resp.code in status_ok_list:
ret = [0, resp.read(), resp.code, resp]
else:
ret = [1, resp.read(), resp.code, resp]
ret = [2, str(err), 500, resp]
except Exception:
logger.error(traceback.format_exc())
ret = [2, str(err), 500, resp]
except Exception:
logger.error(traceback.format_exc())
- ('%s:%s' % (user, passwd)).encode("base64")
+ base64.b64encode(('%s:%s' % (user, passwd)).encode()).decode()
+# ('%s:%s' % (user, passwd)).encode("base64")
resp, resp_content = http.request(
full_url, method=method.upper(),
body=content, headers=headers)
resp, resp_content = http.request(
full_url, method=method.upper(),
body=content, headers=headers)
- resp_status, resp_body = resp['status'], resp_content.decode(
- 'UTF-8')
+ 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]
if resp_status in status_ok_list:
ret = [0, resp_body, resp_status, resp]
ret = [2, str(err), resp_status, resp]
except Exception:
logger.error(traceback.format_exc())
ret = [2, str(err), resp_status, resp]
except Exception:
logger.error(traceback.format_exc())
def req_by_msb(resource, method, content='', headers=None):
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):
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)
return call_multipart_req(base_url, "", "",
rest_no_auth, resource, method, content, headers)