openstack
/
cinder
Code Issues Proposed changes

Merge "Allow removing NFS snapshots in error status" into stable/train

This commit is contained in:
Zuul 2021-11-05 23:48:12 +00:00 committed by Gerrit Code Review
parent 4fde5a3e05 51a06f3fcc
commit 5aed9c679b
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cinder/tests/unit/volume/drivers/test_nfs.py
View File

@ -1378,6 +1378,8 @@ class NfsDriverTestCase(test.TestCase):
mock.patch.object(drv, '_read_info_file', return_value={}), \
mock.patch.object(drv, '_do_create_snapshot') \
as mock_do_create_snapshot, \
mock.patch.object(drv, '_check_snapshot_support') \
as mock_check_support, \
mock.patch.object(drv, '_write_info_file') \
as mock_write_info_file, \
mock.patch.object(drv, 'get_active_image_from_info',
@ -1386,6 +1388,7 @@ class NfsDriverTestCase(test.TestCase):
return_value=snap_path):
self._driver.create_snapshot(fake_snap)
mock_check_support.assert_called_once()
mock_do_create_snapshot.assert_called_with(fake_snap, volume['name'],
snap_path)
mock_write_info_file.assert_called_with(

1
cinder/volume/drivers/nfs.py
View File

@ -574,7 +574,6 @@ class NfsDriver(remotefs.RemoteFSSnapDriverDistributed):
def delete_snapshot(self, snapshot):
"""Apply locking to the delete snapshot operation."""
self._check_snapshot_support()
return self._delete_snapshot(snapshot)
def _copy_volume_from_snapshot(self, snapshot, volume, volume_size):