Fix restcall bug of decode http response content

[multicloud/framework.git] / multivimbroker / multivimbroker / pub / utils / restcall.py

diff --git a/multivimbroker/multivimbroker/pub/utils/restcall.py b/multivimbroker/multivimbroker/pub/utils/restcall.py
index 046d77c..7070824 100644 (file)
--- a/multivimbroker/multivimbroker/pub/utils/restcall.py
+++ b/multivimbroker/multivimbroker/pub/utils/restcall.py
@@ -13,9 +13,14 @@
 import sys
 import traceback
 import logging
-import urllib2
+# import urllib2
+import urllib.request
+import urllib.parse
+import urllib.error
 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
@@ -46,14 +51,13 @@ def call_multipart_req(base_url, user, passwd, auth_type, resource, method,
     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]
-    except urllib2.URLError as err:
+    except urllib.error.URLError as err:
         ret = [2, str(err), 500, resp]
     except Exception:
         logger.error(traceback.format_exc())
@@ -69,7 +73,7 @@ def call_req(base_url, user, passwd, auth_type, resource, method,
 #    logger.debug("[%s]call_req('%s','%s','%s',%s,'%s','%s','%s')" % (
 #    callid, base_url, user, passwd, auth_type, resource, method, content))
     ret = None
-    resp_status = ''
+    resp_status = '500'
     resp = ""
     full_url = ""
 
@@ -81,7 +85,8 @@ def call_req(base_url, user, passwd, auth_type, resource, method,
 
         if user:
             headers['Authorization'] = 'Basic ' + \
-                ('%s:%s' % (user, passwd)).encode("base64")
+                base64.b64encode(('%s:%s' % (user, passwd)).encode()).decode()
+#                ('%s:%s' % (user, passwd)).encode("base64")
         ca_certs = None
         for retry_times in range(3):
             http = httplib2.Http(
@@ -94,8 +99,8 @@ def call_req(base_url, user, passwd, auth_type, resource, method,
                 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]
@@ -109,7 +114,7 @@ def call_req(base_url, user, passwd, auth_type, resource, method,
                            full_url, resp_status, resp]
                     continue
                 raise ex
-    except urllib2.URLError as err:
+    except urllib.error.URLError as err:
         ret = [2, str(err), resp_status, resp]
     except Exception:
         logger.error(traceback.format_exc())