From c83d3efe8bdd0d917a3b63a02f9fe8259cf99faf Mon Sep 17 00:00:00 2001 From: Alvaro Lopez Garcia Date: Fri, 16 Sep 2016 09:42:43 +0200 Subject: [PATCH] Check for the correct HTTP return code when deleting a volume We were checking for a 204, but it will return a 202, so the volume was deleted but we returned an error 500. Change-Id: Id6e7e7def231182ca2e00dca3426501557c5b87e Close-Bug: #1624232 --- ooi/api/helpers.py | 2 +- ooi/tests/unit/controllers/test_helpers.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ooi/api/helpers.py b/ooi/api/helpers.py index 0c14e16..584ff3c 100644 --- a/ooi/api/helpers.py +++ b/ooi/api/helpers.py @@ -551,7 +551,7 @@ class OpenStackHelper(BaseHelper): response = req.get_response(self.app) # FIXME(aloga): this should be handled in get_from_response, shouldn't # it? - if response.status_int not in [204]: + if response.status_int not in [202]: raise exception_from_response(response) def _get_volume_create_req(self, req, name, size): diff --git a/ooi/tests/unit/controllers/test_helpers.py b/ooi/tests/unit/controllers/test_helpers.py index cce7347..7f2c48e 100644 --- a/ooi/tests/unit/controllers/test_helpers.py +++ b/ooi/tests/unit/controllers/test_helpers.py @@ -408,7 +408,7 @@ class TestOpenStackHelper(TestBaseHelper): @mock.patch.object(helpers.OpenStackHelper, "_get_volume_delete_req") def test_volume_delete(self, m): - resp = fakes.create_fake_json_resp(None, 204) + resp = fakes.create_fake_json_resp(None, 202) req_mock = mock.MagicMock() req_mock.get_response.return_value = resp m.return_value = req_mock @@ -1391,4 +1391,4 @@ class TestOpenStackHelperReqs(TestBaseHelper): self.assertEqual(net_id, ret['network_id']) self.assertEqual(device_id, ret['compute_id']) self.assertEqual(ip, ret['ip']) - self.assertEqual(pool, ret['pool']) \ No newline at end of file + self.assertEqual(pool, ret['pool'])