openstack/cinder
Code Issues Proposed changes

Merge "Invalid volume state when manage operation fails"

Browse Source
This commit is contained in:
Jenkins 2016-07-19 20:53:48 +00:00 committed by Gerrit Code Review
commit 6e3d010ecb
2 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
cinder/tests/unit/volume/flows/test_manage_volume_flow.py
View File

@ -11,11 +11,16 @@
# under the License.
""" Tests for manage_existing TaskFlow """
import mock
from cinder import context
from cinder import test
from cinder.tests.unit import fake_constants as fakes
from cinder.tests.unit import fake_volume
from cinder.tests.unit.volume.flows import fake_volume_api
from cinder.volume.flows.api import manage_existing
from cinder.volume.flows import common as flow_common
from cinder.volume.flows.manager import manage_existing as manager
class ManageVolumeFlowTestCase(test.TestCase):
@ -49,3 +54,46 @@ class ManageVolumeFlowTestCase(test.TestCase):
create_what.update({'volume': volume})
create_what.pop('volume_id')
task.execute(self.ctxt, **create_what)
@staticmethod
def _stub_volume_object_get(self):
volume = {
'id': fakes.VOLUME_ID,
'volume_type_id': fakes.VOLUME_TYPE_ID,
'status': 'creating',
'name': fakes.VOLUME_NAME,
}
return fake_volume.fake_volume_obj(self.ctxt, **volume)
def test_prepare_for_quota_reserveration_task_execute(self):
mock_db = mock.MagicMock()
mock_driver = mock.MagicMock()
mock_manage_existing_ref = mock.MagicMock()
mock_get_size = self.mock_object(
mock_driver, 'manage_existing_get_size')
mock_get_size.return_value = '5'
volume_ref = self._stub_volume_object_get(self)
task = manager.PrepareForQuotaReservationTask(mock_db, mock_driver)
result = task.execute(self.ctxt, volume_ref, mock_manage_existing_ref)
self.assertEqual(volume_ref, result['volume_properties'])
self.assertEqual('5', result['size'])
self.assertEqual(volume_ref.id, result['volume_spec']['volume_id'])
mock_get_size.assert_called_once_with(
volume_ref, mock_manage_existing_ref)
def test_prepare_for_quota_reservation_task_revert(self):
mock_db = mock.MagicMock()
mock_driver = mock.MagicMock()
mock_result = mock.MagicMock()
mock_flow_failures = mock.MagicMock()
mock_error_out_volumes = self.mock_object(
flow_common, 'error_out_volume')
volume_ref = self._stub_volume_object_get(self)
task = manager.PrepareForQuotaReservationTask(mock_db, mock_driver)
task.revert(self.ctxt, mock_result, mock_flow_failures, volume_ref)
mock_error_out_volumes.assert_called_once_with(
self.ctxt, mock_db, volume_ref.id, reason=mock.ANY)

10
cinder/volume/flows/manager/manage_existing.py
View File

@ -59,7 +59,14 @@ class PrepareForQuotaReservationTask(flow_utils.CinderTask):
'volume_properties': volume_ref,
'volume_spec': {'status': volume_ref.status,
'volume_name': volume_ref.name,
'volume_id': volume_ref.id}}
'volume_id': volume_id}}
def revert(self, context, result, flow_failures, volume_ref, **kwargs):
volume_id = volume_ref.id
reason = _('Volume manage failed.')
flow_common.error_out_volume(context, self.db,
volume_id, reason=reason)
LOG.error(_LE("Volume %s: manage failed."), volume_id)
class ManageExistingTask(flow_utils.CinderTask):
@ -75,6 +82,7 @@ class ManageExistingTask(flow_utils.CinderTask):
def execute(self, context, volume_ref, manage_existing_ref, size):
model_update = self.driver.manage_existing(volume_ref,
manage_existing_ref)
if not model_update:
model_update = {}
model_update.update({'size': size})