From 91c391e885510c0b3caf8905fe41f222c434b46d Mon Sep 17 00:00:00 2001 From: Evgeny Antyshev Date: Thu, 4 May 2017 13:33:55 +0000 Subject: [PATCH] vzstorage: use remotefs.VZStorageRemoteFSClient After this change I5891940485c5614d188164d2e0af73486cfa6a90 landed, Vzstorage driver still uses RemoteFsClient, which needs to change too. Closes-Bug: 1692479 Change-Id: Ib83e16f990bb629d9b9acb7c403a3f626d4ae6af --- cinder/tests/unit/volume/drivers/test_vzstorage.py | 4 ++-- cinder/volume/drivers/vzstorage.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cinder/tests/unit/volume/drivers/test_vzstorage.py b/cinder/tests/unit/volume/drivers/test_vzstorage.py index 9191468b3bb..6a4ddbadb8a 100644 --- a/cinder/tests/unit/volume/drivers/test_vzstorage.py +++ b/cinder/tests/unit/volume/drivers/test_vzstorage.py @@ -56,8 +56,8 @@ class VZStorageTestCase(test.TestCase): def setUp(self): super(VZStorageTestCase, self).setUp() - self._remotefsclient = mock.patch.object(remotefs, - 'RemoteFsClient').start() + self._remotefsclient = mock.patch.object( + remotefs, 'VZStorageRemoteFSClient').start() get_mount_point = mock.Mock(return_value=self._FAKE_MNT_POINT) self._remotefsclient.get_mount_point = get_mount_point cfg = copy.copy(self._FAKE_VZ_CONFIG) diff --git a/cinder/volume/drivers/vzstorage.py b/cinder/volume/drivers/vzstorage.py index 72313c3b999..097d0dfbaba 100644 --- a/cinder/volume/drivers/vzstorage.py +++ b/cinder/volume/drivers/vzstorage.py @@ -177,7 +177,7 @@ class VZStorageDriver(remotefs_drv.RemoteFSSnapDriver): 'vzstorage_mount_options', CONF.vzstorage_mount_options) - self._remotefsclient = remotefs.RemoteFsClient( + self._remotefsclient = remotefs.VZStorageRemoteFSClient( 'vzstorage', root_helper, execute=execute, vzstorage_mount_point_base=self.base, vzstorage_mount_options=opts)