X-Git-Url: https://gerrit.onap.org/r/gitweb?p=multicloud%2Fframework.git;a=blobdiff_plain;f=multivimbroker%2Fmultivimbroker%2Fforwarder%2Fviews.py;h=1e57d0ebb75a3e35e2a9f84388f5578bf2287612;hp=83d31726a3bd5e07fad79f19a4b19fc637d523bc;hb=69a315e508da7716c0c01caeaafd3da5a3d20599;hpb=887f8f1071c7327b6e24546ee9fa33722463e064

diff --git a/multivimbroker/multivimbroker/forwarder/views.py b/multivimbroker/multivimbroker/forwarder/views.py
index 83d3172..1e57d0e 100644
--- a/multivimbroker/multivimbroker/forwarder/views.py
+++ b/multivimbroker/multivimbroker/forwarder/views.py
@@ -15,12 +15,18 @@
 
 import os
 import json
+import re
+import tempfile
+from poster.encode import multipart_encode
+from poster.streaminghttp import register_openers
 
 from rest_framework.views import APIView
 from rest_framework.views import Response
 from rest_framework.views import status
 from multivimbroker.forwarder.base import BaseHandler
 from multivimbroker.pub.utils.syscomm import originHeaders
+from multivimbroker.pub.utils import syscomm
+from rest_framework.parsers import MultiPartParser
 
 
 class BaseServer(BaseHandler, APIView):
@@ -85,18 +91,7 @@ class Extension(BaseServer):
 class VIMTypes(BaseServer):
 
     def get(self, request):
-        # Fix here unless we have plugin registry
-        json_file = os.path.join(os.path.dirname(__file__),
-                                 '../pub/config/provider-plugin.json')
-        with open(json_file, "r") as f:
-            plugins = json.load(f)
-        ret = []
-        for k, v in plugins.items():
-            item = {}
-            item["vim_type"] = v.get("vim_type")
-            item["versions"] = [k for k in v.get('versions', {})]
-            ret.append(item)
-        return Response(data=ret, status=status.HTTP_200_OK)
+        return Response(data=syscomm.getVIMTypes(), status=status.HTTP_200_OK)
 
 
 class CheckCapacity(BaseServer):
@@ -118,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):
@@ -136,28 +131,65 @@ class Forward(BaseServer):
 
     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
+class MultiPartView(BaseServer):
+
+    parser_classes = (MultiPartParser, )
+
+    def post(self, request, vimid):
+        try:
+            register_openers()
+            fileDict = dict(request.FILES.iterlists())
+            params = {}
+            for key in fileDict.keys():
+                fileObj = fileDict[key][0]
+                f = tempfile.NamedTemporaryFile(prefix="django_",
+                                                suffix=fileObj._name,
+                                                delete=False)
+                f.write(fileObj.file.read())
+                f.seek(fileObj.file.tell(), 0)
+                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=headers)
+        finally:
+            for key in params:
+                fileRef = params[key]
+                if fileRef.closed is False:
+                    fileRef.close()
+                os.remove(fileRef.name)
+        return resp