From 6063ba3dcad5e0c38b11759563e517018ae3bc55 Mon Sep 17 00:00:00 2001 From: Ethan Lynn Date: Thu, 29 Mar 2018 18:51:44 -0700 Subject: [PATCH 1/1] Fix check_vim_capacity Fix check_vim_capacity Change-Id: If0daf58f32ecf509abd5923708b335a29ce91582 Issue-ID: MULTICLOUD-166 Signed-off-by: Ethan Lynn --- multivimbroker/multivimbroker/forwarder/views.py | 6 +++--- multivimbroker/multivimbroker/tests/test_check_capacity.py | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/multivimbroker/multivimbroker/forwarder/views.py b/multivimbroker/multivimbroker/forwarder/views.py index c66a6f1..4f6e6ef 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, str(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): diff --git a/multivimbroker/multivimbroker/tests/test_check_capacity.py b/multivimbroker/multivimbroker/tests/test_check_capacity.py index 60035e0..d7a7cae 100644 --- a/multivimbroker/multivimbroker/tests/test_check_capacity.py +++ b/multivimbroker/multivimbroker/tests/test_check_capacity.py @@ -40,10 +40,10 @@ class CheckCapacityTest(unittest.TestCase): "/v0/check_vim_capacity") with mock.patch.object(self.view, "send") as send: plugin_resp = mock.Mock() - plugin_resp.body = """{ + plugin_resp.content = """{ "result": true }""" - plugin_resp.status_code = status.HTTP_200_OK + plugin_resp.status_code = str(status.HTTP_200_OK) send.return_value = plugin_resp resp = self.view.post(req) @@ -66,10 +66,10 @@ class CheckCapacityTest(unittest.TestCase): "/v0/check_vim_capacity") with mock.patch.object(self.view, "send") as send: plugin_resp = mock.Mock() - plugin_resp.body = """{ + plugin_resp.content = """{ "result": false }""" - plugin_resp.status_code = status.HTTP_200_OK + plugin_resp.status_code = str(status.HTTP_200_OK) send.return_value = plugin_resp resp = self.view.post(req) -- 2.16.6