openstack
/
cinder
Code Issues Proposed changes

Merge "Create volume attachments status check."

This commit is contained in:
Zuul 2019-03-11 03:20:02 +00:00 committed by Gerrit Code Review
parent 5d6814de4f 6eba403ba0
commit 6785bf614b
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cinder/tests/unit/attachments/test_attachments_api.py
View File

@ -314,3 +314,14 @@ class AttachmentManagerTestCase(test.TestCase):
self.context,
aref,
connector)
def test_attachment_create_creating_volume(self):
"""Test attachment_create on a creating volume."""
volume_params = {'status': 'creating'}
vref = tests_utils.create_volume(self.context, **volume_params)
self.assertRaises(exception.InvalidVolume,
self.volume_api.attachment_create,
self.context,
vref,
fake.UUID1)

8
cinder/volume/api.py
View File

@ -2079,7 +2079,7 @@ class API(base.Base):
if not result:
override = False
if instance_uuid:
if instance_uuid and vref.status in ('in-use', 'reserved'):
# Refresh the volume reference in case multiple instances were
# being concurrently attached to the same non-multiattach
# volume.
@ -2094,9 +2094,11 @@ class API(base.Base):
break
if not override:
msg = (_('Volume %(vol_id)s status must be %(statuses)s') %
msg = (_('Volume %(vol_id)s status must be %(statuses)s to '
'reserve, but the current status is %(current)s.') %
{'vol_id': vref.id,
'statuses': utils.build_or_str(expected['status'])})
'statuses': utils.build_or_str(expected['status']),
'current': vref.status})
raise exception.InvalidVolume(reason=msg)
values = {'volume_id': vref.id,