diff --git a/cinder/tests/unit/volume/drivers/test_pure.py b/cinder/tests/unit/volume/drivers/test_pure.py index 37a527d8c4c..8e3cff89259 100644 --- a/cinder/tests/unit/volume/drivers/test_pure.py +++ b/cinder/tests/unit/volume/drivers/test_pure.py @@ -1637,34 +1637,6 @@ class PureBaseVolumeDriverTestCase(PureBaseSharedDriverTestCase): self.assertEqual((None, None), result) mock_create_cg.assert_called_with(mock_context, mock_group) self.assertTrue(self.array.create_pgroup_snapshot.called) - self.assertEqual(num_volumes, self.array.copy_volume.call_count) - self.assertEqual(num_volumes, self.array.set_pgroup.call_count) - self.assertTrue(self.array.destroy_pgroup.called) - - @mock.patch(BASE_DRIVER_OBJ + ".create_consistencygroup") - def test_create_consistencygroup_from_cg_with_error(self, mock_create_cg): - num_volumes = 5 - mock_context = mock.MagicMock() - mock_group = mock.MagicMock() - mock_source_cg = mock.MagicMock() - mock_volumes = [mock.MagicMock() for i in range(num_volumes)] - mock_source_vols = [mock.MagicMock() for i in range(num_volumes)] - - self.array.copy_volume.side_effect = FakePureStorageHTTPError() - - self.assertRaises( - FakePureStorageHTTPError, - self.driver.create_consistencygroup_from_src, - mock_context, - mock_group, - mock_volumes, - source_cg=mock_source_cg, - source_vols=mock_source_vols - ) - mock_create_cg.assert_called_with(mock_context, mock_group) - self.assertTrue(self.array.create_pgroup_snapshot.called) - # Make sure that the temp snapshot is cleaned up even when copying - # the volume fails! self.assertTrue(self.array.destroy_pgroup.called) @mock.patch(BASE_DRIVER_OBJ + ".delete_volume", autospec=True) diff --git a/cinder/volume/drivers/pure.py b/cinder/volume/drivers/pure.py index 3ba40c6bb35..a79d8f1e6f0 100644 --- a/cinder/volume/drivers/pure.py +++ b/cinder/volume/drivers/pure.py @@ -897,6 +897,7 @@ class PureBaseVolumeDriver(san.SanDriver): 'source_group': source_group.id}) current_array = self._get_current_array() current_array.create_pgroup_snapshot(pgroup_name, suffix=tmp_suffix) + volumes, _ = self.update_provider_info(volumes, None) try: for source_vol, cloned_vol in zip(source_vols, volumes): source_snap_name = self._get_pgroup_vol_snap_name( diff --git a/releasenotes/notes/pure_tempest_cg_fix-913d405f7487de00.yaml b/releasenotes/notes/pure_tempest_cg_fix-913d405f7487de00.yaml new file mode 100644 index 00000000000..a179a00f387 --- /dev/null +++ b/releasenotes/notes/pure_tempest_cg_fix-913d405f7487de00.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Pure Storage FlashArray driver fix to ensure cinder_tempest_plugin consistency + group tests pass.