Fix the nslcm problem of registering MSB with HTTPS

[vfc/nfvo/lcm.git] / lcm / pub / utils / restcall.py

diff --git a/lcm/pub/utils/restcall.py b/lcm/pub/utils/restcall.py
index e4fca71..b2f14e3 100644 (file)
--- a/lcm/pub/utils/restcall.py
+++ b/lcm/pub/utils/restcall.py
@@ -12,14 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import base64
 import sys
 import traceback
 import logging
-import urllib2
+import urllib.request
+import urllib.error
+import urllib.parse
 import uuid
 import httplib2
+import requests
 
-from lcm.pub.config.config import MSB_SERVICE_IP, MSB_SERVICE_PORT
+from lcm.pub.config.config import MSB_BASE_URL
 
 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'
@@ -34,12 +38,13 @@ def call_req(base_url, user, passwd, auth_type, resource, method, content='', ad
     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_Location = ''
     resp_status = ''
     try:
         full_url = combine_url(base_url, resource)
         headers = {'content-type': 'application/json', 'accept': 'application/json'}
         if user:
-            headers['Authorization'] = 'Basic ' + ('%s:%s' % (user, passwd)).encode("base64")
+            headers['Authorization'] = 'Basic %s' % base64.b64encode(bytes('%s:%s' % (user, passwd), "utf-8")).decode()
         ca_certs = None
         if additional_headers:
             headers.update(additional_headers)
@@ -49,56 +54,58 @@ def call_req(base_url, user, passwd, auth_type, resource, method, content='', ad
             try:
                 resp, resp_content = http.request(full_url, method=method.upper(), body=content, headers=headers)
                 resp_status, resp_body = resp['status'], resp_content
+                resp_Location = resp.get('Location', "")
                 logger.debug("[%s][%d]status=%s)" % (callid, retry_times, resp_status))
                 if headers['accept'] == 'application/json':
                     resp_body = resp_content.decode('UTF-8')
                     logger.debug("resp_body=%s", resp_body)
                 if resp_status in status_ok_list:
-                    ret = [0, resp_body, resp_status]
+                    ret = [0, resp_body, resp_status, resp_Location]
                 else:
-                    ret = [1, resp_body, resp_status]
+                    ret = [1, resp_body, resp_status, resp_Location]
                 break
             except Exception as ex:
                 if 'httplib.ResponseNotReady' in str(sys.exc_info()):
                     logger.debug("retry_times=%d", retry_times)
                     logger.error(traceback.format_exc())
-                    ret = [1, "Unable to connect to %s" % full_url, resp_status]
+                    ret = [1, "Unable to connect to %s" % full_url, resp_status, resp_Location]
                     continue
                 raise ex
-    except urllib2.URLError as err:
-        ret = [2, str(err), resp_status]
+    except urllib.error.URLError as err:
+        ret = [2, str(err), resp_status, resp_Location]
     except Exception as ex:
         logger.error(traceback.format_exc())
         logger.error("[%s]ret=%s" % (callid, str(sys.exc_info())))
         res_info = str(sys.exc_info())
         if 'httplib.ResponseNotReady' in res_info:
             res_info = "The URL[%s] request failed or is not responding." % full_url
-        ret = [3, res_info, resp_status]
+        ret = [3, res_info, resp_status, resp_Location]
     except:
         logger.error(traceback.format_exc())
-        ret = [4, str(sys.exc_info()), resp_status]
+        ret = [4, str(sys.exc_info()), resp_status, resp_Location]
 
     logger.debug("[%s]ret=%s" % (callid, str(ret)))
     return ret
 
 
 def req_by_msb(resource, method, content=''):
-    base_url = "http://%s:%s/" % (MSB_SERVICE_IP, MSB_SERVICE_PORT)
+    logger.debug("resource: %s, method: %s, content: %s" % (resource, method, content))
+    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 = "http://%s:%s/%s" % (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')
+
+def upload_by_msb(resource, method, file_data):
+    headers = {'accept': 'application/json'}
+    full_url = "%s/%s" % (MSB_BASE_URL, resource)
+    r = requests.post(full_url, files=file_data, headers=headers)
+    resp_status, resp_body = str(r.status_code), r.text
     if resp_status not in status_ok_list:
         logger.error("Status code is %s, detail is %s.", resp_status, resp_body)
         return [1, "Failed to upload file.", resp_status]
     logger.debug("resp_body=%s", resp_body)
     return [0, resp_body, resp_status]
 
+
 def combine_url(base_url, resource):
     full_url = None
     if base_url.endswith('/') and resource.startswith('/'):