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=c66a6f1fdcd11ee956efa2ee26993881a5bdc877;hb=69a315e508da7716c0c01caeaafd3da5a3d20599;hpb=ff40a0cee1f8de73d8d764cc97495f6615c3d1eb diff --git a/multivimbroker/multivimbroker/forwarder/views.py b/multivimbroker/multivimbroker/forwarder/views.py index c66a6f1..1e57d0e 100644 --- a/multivimbroker/multivimbroker/forwarder/views.py +++ b/multivimbroker/multivimbroker/forwarder/views.py @@ -113,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): @@ -131,31 +131,33 @@ 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