removed OriginHeader method in Multipart view

Change-Id: I5ba662e052ddfbcce1247c2cc3b048ab9e64c50b
Issue-ID: MULTICLOUD-180
Signed-off-by: SudhakarReddy <Sudhakar.reddy@amdocs.com>

diff --git a/multivimbroker/multivimbroker/forwarder/views.py b/multivimbroker/multivimbroker/forwarder/views.py
index a5dd22c..c66a6f1 100644 (file)
--- a/multivimbroker/multivimbroker/forwarder/views.py
+++ b/multivimbroker/multivimbroker/forwarder/views.py
@@ -15,6 +15,7 @@
 
 import os
 import json
 
 import os
 import json

+import re

 import tempfile
 from poster.encode import multipart_encode
 from poster.streaminghttp import register_openers
 import tempfile
 from poster.encode import multipart_encode
 from poster.streaminghttp import register_openers


@@ -177,8 +178,12 @@ class MultiPartView(BaseServer):
                 fileObj.file.close()
                 params[key] = open(f.name, 'rb')
             datagen, headers = multipart_encode(params)
                 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",
             resp = self.send(vimid, request.path, datagen, "POST",

-                             headers=originHeaders(request))
+                             headers=headers)

         finally:
             for key in params:
                 fileRef = params[key]
         finally:
             for key in params:
                 fileRef = params[key]

diff --git a/multivimbroker/multivimbroker/pub/utils/restcall.py b/multivimbroker/multivimbroker/pub/utils/restcall.py
index c839f61..046d77c 100644 (file)
--- a/multivimbroker/multivimbroker/pub/utils/restcall.py
+++ b/multivimbroker/multivimbroker/pub/utils/restcall.py
@@ -54,7 +54,7 @@ def call_multipart_req(base_url, user, passwd, auth_type, resource, method,
         else:
             ret = [1, resp.read(), resp.code, resp]
     except urllib2.URLError as err:
         else:
             ret = [1, resp.read(), resp.code, resp]
     except urllib2.URLError as err:

-        ret = [2, str(err), resp.code, resp]
+        ret = [2, str(err), 500, resp]

     except Exception:
         logger.error(traceback.format_exc())
         logger.error("[%s]ret=%s" % (callid, str(sys.exc_info())))
     except Exception:
         logger.error(traceback.format_exc())
         logger.error("[%s]ret=%s" % (callid, str(sys.exc_info())))