openstack/cinder
Code Issues Proposed changes

Merge "Add migrate_volume to BaseVD"

Browse Source
This commit is contained in:
Jenkins 2015-09-11 17:12:46 +00:00 committed by Gerrit Code Review
commit fc84c1b62d
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cinder/tests/unit/test_glusterfs.py
View File

@ -1792,3 +1792,16 @@ class GlusterFsDriverTestCase(test.TestCase):
mock_upload_volume.assert_called_once_with( mock_upload_volume.assert_called_once_with(
mock.ANY, mock.ANY, mock.ANY, upload_path) mock.ANY, mock.ANY, mock.ANY, upload_path)
self.assertEqual(1, mock_create_temporary_file.call_count) self.assertEqual(1, mock_create_temporary_file.call_count)
def test_migrate_volume_is_there(self):
"""Ensure that driver.migrate_volume() is there."""
drv = self._driver
ctxt = context.RequestContext('fake_user', 'fake_project')
volume = self._simple_volume()
ret = drv.migrate_volume(ctxt,
volume,
mock.sentinel.host)
self.assertEqual((False, None), ret)

8
cinder/volume/driver.py
View File

@ -1400,6 +1400,14 @@ class BaseVD(object):
""" """
return None, None return None, None
def migrate_volume(self, context, volume, host):
"""Migrate volume stub.
This is for drivers that don't implement an enhanced version
of this operation.
"""
return (False, None)
@six.add_metaclass(abc.ABCMeta) @six.add_metaclass(abc.ABCMeta)
class LocalVD(object): class LocalVD(object):