08b1ad0c9d
The "Scaling backup service" patch [1] in Cinder (merged a couple of days ago) uses os-brick to perform a local attach volume. It revealed that the support for Scality SOFS in os-brick was broken. (we did have a CI in Cinder but the os-brick code path was not fully exercised until [1] merged). This patch addresses this issue. The patch introduces a new class called `ScalityRemoteFsClient` which inherits from `RemoteFsClient`. We can't strictly use the `RemoteFsClient` because how to mount Scality FS is a bit different from other FS. Note that without this patch, the Scality Cinder driver is broken, more precisely cinder backup is broken. So I would appreciate if we can merge that for Mitaka (which needs another minor/micro(?) release of os-brick) [1] https://review.openstack.org/#/c/262395/ Change-Id: Icfa09b124d252d1d6b07d9cff8c63c7c0d65cc30
227 lines
10 KiB
Python
227 lines
10 KiB
Python
# -*- coding: utf-8 -*-
|
|
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import mock
|
|
import os
|
|
import tempfile
|
|
|
|
from oslo_concurrency import processutils as putils
|
|
|
|
from os_brick import exception
|
|
from os_brick.remotefs import remotefs
|
|
from os_brick.tests import base
|
|
|
|
|
|
class RemoteFsClientTestCase(base.TestCase):
|
|
|
|
def setUp(self):
|
|
super(RemoteFsClientTestCase, self).setUp()
|
|
self.mock_execute = mock.patch.object(putils, 'execute').start()
|
|
|
|
@mock.patch.object(remotefs.RemoteFsClient, '_read_mounts',
|
|
return_value=[])
|
|
def test_cifs(self, mock_read_mounts):
|
|
client = remotefs.RemoteFsClient("cifs", root_helper='true',
|
|
execute=putils.execute,
|
|
smbfs_mount_point_base='/mnt')
|
|
share = '10.0.0.1:/qwe'
|
|
mount_point = client.get_mount_point(share)
|
|
client.mount(share)
|
|
calls = [mock.call('mkdir', '-p', mount_point, check_exit_code=0),
|
|
mock.call('mount', '-t', 'cifs', share, mount_point,
|
|
run_as_root=True, root_helper='true',
|
|
check_exit_code=0)]
|
|
self.mock_execute.assert_has_calls(calls)
|
|
|
|
@mock.patch.object(remotefs.RemoteFsClient, '_read_mounts',
|
|
return_value=[])
|
|
def test_vzstorage_by_cluster_name(self, mock_read_mounts):
|
|
client = remotefs.RemoteFsClient("vzstorage", root_helper='true',
|
|
execute=putils.execute,
|
|
vzstorage_mount_point_base='/mnt')
|
|
share = 'qwe'
|
|
cluster_name = share
|
|
mount_point = client.get_mount_point(share)
|
|
client.mount(share)
|
|
calls = [mock.call('mkdir', '-p', mount_point, check_exit_code=0),
|
|
mock.call('pstorage-mount', '-c', cluster_name, mount_point,
|
|
root_helper='true', check_exit_code=0,
|
|
run_as_root=True)]
|
|
self.mock_execute.assert_has_calls(calls)
|
|
|
|
@mock.patch.object(remotefs.RemoteFsClient, '_read_mounts',
|
|
return_value=[])
|
|
def test_vzstorage_with_auth(self, mock_read_mounts):
|
|
client = remotefs.RemoteFsClient("vzstorage", root_helper='true',
|
|
execute=putils.execute,
|
|
vzstorage_mount_point_base='/mnt')
|
|
cluster_name = 'qwe'
|
|
password = '123456'
|
|
share = '%s:%s' % (cluster_name, password)
|
|
mount_point = client.get_mount_point(share)
|
|
client.mount(share)
|
|
calls = [mock.call('mkdir', '-p', mount_point, check_exit_code=0),
|
|
mock.call('pstorage', '-c', cluster_name, 'auth-node', '-P',
|
|
process_input=password, root_helper='true',
|
|
run_as_root=True),
|
|
mock.call('pstorage-mount', '-c', cluster_name, mount_point,
|
|
root_helper='true', check_exit_code=0,
|
|
run_as_root=True)]
|
|
self.mock_execute.assert_has_calls(calls)
|
|
|
|
@mock.patch.object(remotefs.RemoteFsClient, '_read_mounts',
|
|
return_value=[])
|
|
def test_vzstorage_with_mds_list(self, mock_read_mounts):
|
|
client = remotefs.RemoteFsClient("vzstorage", root_helper='true',
|
|
execute=putils.execute,
|
|
vzstorage_mount_point_base='/mnt')
|
|
cluster_name = 'qwe'
|
|
mds_list = ['10.0.0.1', '10.0.0.2']
|
|
share = '%s:/%s' % (','.join(mds_list), cluster_name)
|
|
mount_point = client.get_mount_point(share)
|
|
vz_conf_dir = os.path.join('/etc/pstorage/clusters/', cluster_name)
|
|
|
|
tmp_dir = tempfile.mkdtemp()
|
|
with mock.patch.object(tempfile, 'mkdtemp',
|
|
return_value=tmp_dir):
|
|
client.mount(share)
|
|
|
|
saved_mds_list = open(os.path.join(tmp_dir, 'bs_list')).read().split()
|
|
self.assertEqual(set(mds_list), set(saved_mds_list))
|
|
calls = [mock.call('mkdir', '-p', mount_point, check_exit_code=0),
|
|
mock.call('cp', '-rf', tmp_dir, vz_conf_dir,
|
|
run_as_root=True, root_helper='true'),
|
|
mock.call('chown', '-R', 'root:root', vz_conf_dir,
|
|
run_as_root=True, root_helper='true'),
|
|
mock.call('pstorage-mount', '-c', cluster_name, mount_point,
|
|
root_helper='true', check_exit_code=0,
|
|
run_as_root=True)]
|
|
self.mock_execute.assert_has_calls(calls)
|
|
|
|
@mock.patch.object(remotefs.RemoteFsClient, '_read_mounts',
|
|
return_value=[])
|
|
def test_vzstorage_invalid_share(self, mock_read_mounts):
|
|
client = remotefs.RemoteFsClient("vzstorage", root_helper='true',
|
|
execute=putils.execute,
|
|
vzstorage_mount_point_base='/mnt')
|
|
self.assertRaises(exception.BrickException, client.mount, ':')
|
|
|
|
@mock.patch.object(remotefs.RemoteFsClient, '_read_mounts',
|
|
return_value=[])
|
|
def test_nfs(self, mock_read_mounts):
|
|
client = remotefs.RemoteFsClient("nfs", root_helper='true',
|
|
execute=putils.execute,
|
|
nfs_mount_point_base='/mnt')
|
|
share = '10.0.0.1:/qwe'
|
|
mount_point = client.get_mount_point(share)
|
|
client.mount(share)
|
|
calls = [mock.call('mkdir', '-p', mount_point, check_exit_code=0),
|
|
mock.call('mount', '-t', 'nfs', '-o', 'vers=4,minorversion=1',
|
|
share, mount_point, check_exit_code=0,
|
|
run_as_root=True, root_helper='true')]
|
|
self.mock_execute.assert_has_calls(calls)
|
|
|
|
def test_read_mounts(self):
|
|
mounts = """device1 on mnt_point1
|
|
device2 on mnt_point2 type ext4 opts"""
|
|
with mock.patch.object(putils, 'execute', return_value=[mounts, '']):
|
|
client = remotefs.RemoteFsClient("cifs", root_helper='true',
|
|
execute=putils.execute,
|
|
smbfs_mount_point_base='/mnt')
|
|
ret = client._read_mounts()
|
|
self.assertEqual(ret, {'mnt_point1': 'device1',
|
|
'mnt_point2': 'device2'})
|
|
|
|
@mock.patch.object(putils, 'execute')
|
|
@mock.patch.object(remotefs.RemoteFsClient, '_do_mount')
|
|
def test_mount_already_mounted(self, mock_do_mount, mock_execute):
|
|
share = "10.0.0.1:/share"
|
|
client = remotefs.RemoteFsClient("cifs", root_helper='true',
|
|
execute=putils.execute,
|
|
smbfs_mount_point_base='/mnt')
|
|
mounts = {client.get_mount_point(share): 'some_dev'}
|
|
with mock.patch.object(client, '_read_mounts',
|
|
return_value=mounts):
|
|
client.mount(share)
|
|
self.assertEqual(mock_do_mount.call_count, 0)
|
|
self.assertEqual(mock_execute.call_count, 0)
|
|
|
|
def _test_no_mount_point(self, fs_type):
|
|
self.assertRaises(exception.InvalidParameterValue,
|
|
remotefs.RemoteFsClient,
|
|
fs_type, root_helper='true', execute=putils.execute)
|
|
|
|
def test_no_mount_point_nfs(self):
|
|
self._test_no_mount_point('nfs')
|
|
|
|
def test_no_mount_point_cifs(self):
|
|
self._test_no_mount_point('cifs')
|
|
|
|
def test_no_mount_point_glusterfs(self):
|
|
self._test_no_mount_point('glusterfs')
|
|
|
|
def test_no_mount_point_vzstorage(self):
|
|
self._test_no_mount_point('vzstorage')
|
|
|
|
def test_no_mount_point_quobyte(self):
|
|
self._test_no_mount_point('quobyte')
|
|
|
|
def test_invalid_fs(self):
|
|
self.assertRaises(exception.ProtocolNotSupported,
|
|
remotefs.RemoteFsClient,
|
|
'my_fs', root_helper='true', execute=putils.execute)
|
|
|
|
def test_init_sets_mount_base(self):
|
|
client = remotefs.RemoteFsClient("cifs", root_helper='true',
|
|
smbfs_mount_point_base='/fake',
|
|
cifs_mount_point_base='/fake2')
|
|
# Tests that although the FS type is "cifs", the config option
|
|
# starts with "smbfs_"
|
|
self.assertEqual('/fake', client._mount_base)
|
|
|
|
@mock.patch('os_brick.remotefs.remotefs.RemoteFsClient._check_nfs_options')
|
|
def test_init_nfs_calls_check_nfs_options(self, mock_check_nfs_options):
|
|
remotefs.RemoteFsClient("nfs", root_helper='true',
|
|
nfs_mount_point_base='/fake')
|
|
mock_check_nfs_options.assert_called_once_with()
|
|
|
|
|
|
class ScalityRemoteFsClientTestCase(base.TestCase):
|
|
|
|
def setUp(self):
|
|
super(ScalityRemoteFsClientTestCase, self).setUp()
|
|
|
|
def test_no_mount_point_scality(self):
|
|
self.assertRaises(exception.InvalidParameterValue,
|
|
remotefs.ScalityRemoteFsClient,
|
|
'scality', root_helper='true')
|
|
|
|
def test_get_mount_point(self):
|
|
fsclient = remotefs.ScalityRemoteFsClient(
|
|
'scality', root_helper='true', scality_mount_point_base='/fake')
|
|
self.assertEqual('/fake/path/00', fsclient.get_mount_point('path'))
|
|
|
|
@mock.patch('oslo_concurrency.processutils.execute')
|
|
@mock.patch('os_brick.remotefs.remotefs.RemoteFsClient._do_mount')
|
|
def test_mount(self, mock_do_mount, mock_execute):
|
|
fsclient = remotefs.ScalityRemoteFsClient(
|
|
'scality', root_helper='true', scality_mount_point_base='/fake')
|
|
with mock.patch.object(fsclient, '_read_mounts', return_value={}):
|
|
fsclient.mount('fake')
|
|
|
|
mock_execute.assert_called_once_with(
|
|
'mkdir', '-p', '/fake', check_exit_code=0)
|
|
mock_do_mount.assert_called_once_with(
|
|
'sofs', '/etc/sfused.conf', '/fake')
|