openstack/cinder
Code Issues Proposed changes

Merge "vzstorage: use remotefs.VZStorageRemoteFSClient"

Browse Source
This commit is contained in:
Jenkins 2017-08-07 16:02:36 +00:00 committed by Gerrit Code Review
commit 7ec31dcfe3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cinder/tests/unit/volume/drivers/test_vzstorage.py
View File

@ -56,8 +56,8 @@ class VZStorageTestCase(test.TestCase):
def setUp(self): def setUp(self):
super(VZStorageTestCase, self).setUp() super(VZStorageTestCase, self).setUp()
self._remotefsclient = mock.patch.object(remotefs, self._remotefsclient = mock.patch.object(
'RemoteFsClient').start() remotefs, 'VZStorageRemoteFSClient').start()
get_mount_point = mock.Mock(return_value=self._FAKE_MNT_POINT) get_mount_point = mock.Mock(return_value=self._FAKE_MNT_POINT)
self._remotefsclient.get_mount_point = get_mount_point self._remotefsclient.get_mount_point = get_mount_point
cfg = copy.copy(self._FAKE_VZ_CONFIG) cfg = copy.copy(self._FAKE_VZ_CONFIG)

2
cinder/volume/drivers/vzstorage.py
View File

@ -177,7 +177,7 @@ class VZStorageDriver(remotefs_drv.RemoteFSSnapDriver):
self.base = self.configuration.vzstorage_mount_point_base self.base = self.configuration.vzstorage_mount_point_base
opts = self.configuration.vzstorage_mount_options opts = self.configuration.vzstorage_mount_options
self._remotefsclient = remotefs.RemoteFsClient( self._remotefsclient = remotefs.VZStorageRemoteFSClient(
'vzstorage', root_helper, execute=execute, 'vzstorage', root_helper, execute=execute,
vzstorage_mount_point_base=self.base, vzstorage_mount_point_base=self.base,
vzstorage_mount_options=opts) vzstorage_mount_options=opts)