X-Git-Url: https://gerrit.onap.org/r/gitweb?p=multicloud%2Fframework.git;a=blobdiff_plain;f=multivimbroker%2Fmultivimbroker%2Fpub%2Futils%2Frestcall.py;h=c7386dc64f81ce267222152b3643846e78abafab;hp=d06818214e015380890b7de1f7d3b62379a6f7e3;hb=0a542045a647da97f24b22ef41e422edac30ed9f;hpb=7ef4d9292529e9a3336368430361f9a63f48c54d

diff --git a/multivimbroker/multivimbroker/pub/utils/restcall.py b/multivimbroker/multivimbroker/pub/utils/restcall.py
index d068182..c7386dc 100644
--- a/multivimbroker/multivimbroker/pub/utils/restcall.py
+++ b/multivimbroker/multivimbroker/pub/utils/restcall.py
@@ -1,4 +1,5 @@
 # Copyright (c) 2017 Wind River Systems, Inc.
+# Copyright (c) 2017-2018 VMware, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,14 +13,20 @@
 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
 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
@@ -33,13 +40,41 @@ HTTP_401_UNAUTHORIZED, HTTP_400_BADREQUEST = '401', '400'
 logger = logging.getLogger(__name__)
 
 
+def call_multipart_req(base_url, user, passwd, auth_type, resource, method,
+                       content, headers=None):
+    callid = str(uuid.uuid1())
+#    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 = ""
+    full_url = ""
+
+    try:
+        full_url = combine_url(base_url, resource)
+        logger.debug("request=%s)" % full_url)
+        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 urllib.error.URLError as err:
+        ret = [2, str(err), 500, resp]
+    except Exception:
+        logger.error(traceback.format_exc())
+        logger.error("[%s]ret=%s" % (callid, str(sys.exc_info())))
+        res_info = str(sys.exc_info())
+        ret = [3, res_info, 500, resp]
+    return ret
+
+
 def call_req(base_url, user, passwd, auth_type, resource, method,
              content='', headers=None):
     callid = str(uuid.uuid1())
 #    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 = ""
 
@@ -51,7 +86,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(
@@ -64,8 +100,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]
@@ -79,7 +115,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())
@@ -95,11 +131,19 @@ def call_req(base_url, user, passwd, auth_type, resource, method,
 
 
 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 = "%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)
+
+
 def get_res_from_aai(resource, content=''):
     headers = {
         'X-FromAppId': 'MultiCloud',