Fix a bug in check_vim_capacity

[multicloud/framework.git] / multivimbroker / multivimbroker / forwarder / views.py

diff --git a/multivimbroker/multivimbroker/forwarder/views.py b/multivimbroker/multivimbroker/forwarder/views.py
index a5dd22c..89e222a 100644 (file)
--- a/multivimbroker/multivimbroker/forwarder/views.py
+++ b/multivimbroker/multivimbroker/forwarder/views.py
@@ -15,6 +15,7 @@
 
 import os
 import json
+import re
 import tempfile
 from poster.encode import multipart_encode
 from poster.streaminghttp import register_openers
@@ -112,11 +113,11 @@ class CheckCapacity(BaseServer):
         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):
@@ -177,8 +178,12 @@ class MultiPartView(BaseServer):
                 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]