import os
import json
+import re
import tempfile
from poster.encode import multipart_encode
from poster.streaminghttp import register_openers
for vim in body.get("VIMs", []):
url = request.get_full_path().replace(
"check_vim_capacity", "%s/capacity_check" % vim)
- resp = self.send(vim, url, newbody, "POST")
- if resp.status_code != status.HTTP_200_OK:
+ resp = self.send(vim, url, json.dumps(newbody), "POST")
+ if int(resp.status_code) != status.HTTP_200_OK:
continue
try:
- resp_body = json.loads(resp.body)
+ resp_body = json.loads(resp.content)
except ValueError:
continue
if not resp_body.get("result", False):
def get(self, request, vimid):
- return self.send(vimid, request.get_full_path(), request.body, "GET")
+ return self.send(vimid, request.get_full_path(), request.body, "GET",
+ headers=originHeaders(request))
def post(self, request, vimid):
return self.send(vimid, request.get_full_path(), request.body, "POST",
- headers=None)
+ headers=originHeaders(request))
def patch(self, request, vimid):
return self.send(vimid, request.get_full_path(), request.body, "PATCH",
- headers=None)
+ headers=originHeaders(request))
def delete(self, request, vimid):
return self.send(vimid, request.get_full_path(), request.body,
- "DELETE", headers=None)
+ "DELETE", headers=originHeaders(request))
def head(self, request, vimid):
- return self.send(vimid, request.get_full_path(), request.body, "HEAD")
+ return self.send(vimid, request.get_full_path(), request.body, "HEAD",
+ headers=originHeaders(request))
def put(self, request, vimid):
return self.send(vimid, request.get_full_path(), request.body, "PUT",
- headers=None)
+ headers=originHeaders(request))
# Multipart view
fileObj.file.close()
params[key] = open(f.name, 'rb')
datagen, headers = multipart_encode(params)
+ regex = re.compile('^HTTP_')
+ for key, value in request.META.iteritems():
+ if key.startswith("HTTP_"):
+ headers[regex.sub('', key).replace('_', '-')] = value
resp = self.send(vimid, request.path, datagen, "POST",
- headers=originHeaders(request))
+ headers=headers)
finally:
for key in params:
fileRef = params[key]