X-Git-Url: https://gerrit.onap.org/r/gitweb?p=multicloud%2Fframework.git;a=blobdiff_plain;f=multivimbroker%2Fmultivimbroker%2Fforwarder%2Fviews.py;fp=multivimbroker%2Fmultivimbroker%2Fforwarder%2Fviews.py;h=80146b6620d808c98edf86b82211b1bf8aa144c4;hp=0219dd41d80a50372fdcc70268c6fd312553811b;hb=7c194de2d67a1c71b741345a74ed9a493936fdb0;hpb=5a2620962e6d2a572586de8da72a5a7676834130 diff --git a/multivimbroker/multivimbroker/forwarder/views.py b/multivimbroker/multivimbroker/forwarder/views.py index 0219dd4..80146b6 100644 --- a/multivimbroker/multivimbroker/forwarder/views.py +++ b/multivimbroker/multivimbroker/forwarder/views.py @@ -13,13 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -import os +# import os import json -import re -import tempfile -from django.core.files.uploadedfile import InMemoryUploadedFile -from poster.encode import multipart_encode -from poster.streaminghttp import register_openers +# import re +# import tempfile +# from django.core.files.uploadedfile import InMemoryUploadedFile +# from poster.encode import multipart_encode +# from poster.streaminghttp import register_openers from rest_framework.views import APIView from rest_framework.views import Response @@ -227,8 +227,10 @@ class APIv1CheckCapacity(CheckCapacity): vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id) resp = self.send(vimid, url, json.dumps(newbody), "POST", headers=originHeaders(request)) + if int(resp.status_code) != status.HTTP_200_OK: continue + try: resp_body = json.loads(resp.content) except ValueError: @@ -290,34 +292,38 @@ class APIv1InfraWorkload(BaseServer): "DELETE", headers=originHeaders(request)) def __process_multipart(self, request, vimid): - try: - register_openers() - dataDict = dict(request.data.iterlists()) - params = {} - for key in dataDict.keys(): - dataObj = dataDict[key][0] - if isinstance(dataObj, InMemoryUploadedFile): - f = tempfile.NamedTemporaryFile(prefix="django_", - suffix=dataObj._name, - delete=False) - f.write(dataObj.file.read()) - f.seek(dataObj.file.tell(), 0) - dataObj.file.close() - params[key] = open(f.name, 'rb') - else: - params[key] = dataObj - 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, multipart=True) - finally: - for key in params: - refobj = params[key] - if type(refobj) is not unicode: - if refobj.closed is False: - print refobj.close() - os.remove(refobj.name) - return resp + return Response( + data={'error': 'multipart API is not supported yet'}, + status=status.HTTP_400_BAD_REQUEST) +# try: +# API is depreciated due to poster not available in py3 +# register_openers() +# dataDict = dict(request.data.iterlists()) +# params = {} +# for key in dataDict.keys(): +# dataObj = dataDict[key][0] +# if isinstance(dataObj, InMemoryUploadedFile): +# f = tempfile.NamedTemporaryFile(prefix="django_", +# suffix=dataObj._name, +# delete=False) +# f.write(dataObj.file.read()) +# f.seek(dataObj.file.tell(), 0) +# dataObj.file.close() +# params[key] = open(f.name, 'rb') +# else: +# params[key] = dataObj +# 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, multipart=True) +# finally: +# for key in params or {}: +# refobj = params[key] +# if type(refobj) is not unicode: +# if refobj.closed is False: +# print (refobj.close()) +# os.remove(refobj.name) +# return resp