openstack/nova
Code Issues Proposed changes

Merge "Change exception type while deattaching root device"

Browse Source
This commit is contained in:
Zuul
2018-05-26 17:09:23 +00:00
committed by Gerrit Code Review
parent e59fe30bdb d2e40a3e49
commit 5bf9aa7fd4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nova/api/openstack/compute/volumes.py
View File

@@ -433,7 +433,7 @@ class VolumeAttachmentController(wsgi.Controller):
if bdm.is_root: if bdm.is_root:
msg = _("Cannot detach a root device volume") msg = _("Cannot detach a root device volume")
raise exc.HTTPForbidden(explanation=msg) raise exc.HTTPBadRequest(explanation=msg)
try: try:
self.compute_api.detach_volume(context, instance, volume) self.compute_api.detach_volume(context, instance, volume)

2
nova/tests/unit/api/openstack/compute/test_volumes.py
View File

@@ -541,7 +541,7 @@ class VolumeAttachTestsV21(test.NoDBTestCase):
new_callable=mock.PropertyMock) new_callable=mock.PropertyMock)
def test_detach_vol_root(self, mock_isroot): def test_detach_vol_root(self, mock_isroot):
mock_isroot.return_value = True mock_isroot.return_value = True
self.assertRaises(exc.HTTPForbidden, self.assertRaises(exc.HTTPBadRequest,
self.attachments.delete, self.attachments.delete,
self.req, self.req,
FAKE_UUID, FAKE_UUID,