Change-Id: I82e69668c64369f6f67b1b8fa088e28cc476e8f9
Issue-ID: VFC-1009
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
import urllib2
import uuid
import httplib2
import urllib2
import uuid
import httplib2
from lcm.pub.config.config import MSB_SERVICE_IP, MSB_SERVICE_PORT
from lcm.pub.config.config import MSB_SERVICE_IP, MSB_SERVICE_PORT
return call_req(base_url, "", "", rest_no_auth, resource, method, content)
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'}
+def upload_by_msb(resource, method, file_data):
+ headers = {'accept': 'application/json'}
full_url = "http://%s:%s/%s" % (MSB_SERVICE_IP, MSB_SERVICE_PORT, resource)
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')
+ 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]
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]