x
/
ooi
Code Issues Proposed changes

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
This commit is contained in:
Alvaro Lopez Garcia 2016-09-16 09:42:43 +02:00
parent ae5712e6f3
commit c83d3efe8b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ooi/api/helpers.py
View File

@ -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):

4
ooi/tests/unit/controllers/test_helpers.py
View File

@ -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'])
self.assertEqual(pool, ret['pool'])