[Infinidat] fixed host assisted migration
Fixed an issue in Infinidat driver to support host assisted migration. And added new configuration options: * `infinidat_snapdir_accessible` to configure access to the `.snapshot` directory on the client side. * `infinidat_snapdir_visible` to configure visibility of the `.snapshot` directory on the client side. Closes-Bug: #1992443 Signed-off-by: Alexander Deiter <adeiter@infinidat.com> Change-Id: I29b51fcec28dd5110de6ad196ff8b67c875ce8fa
This commit is contained in:
Alexander Deiter
parent
b8fdf9b9e7
commit
7ec7321053
@ -133,6 +133,31 @@ Configure the driver back-end section with the parameters below.
|
||||
|
||||
This parameter defaults to ``true``.
|
||||
|
||||
* Controls access to the ``.snapshot`` directory:
|
||||
|
||||
.. code-block:: ini
|
||||
|
||||
infinidat_snapdir_accessible = true/false
|
||||
|
||||
By default, each share allows access to its own ``.snapshot`` directory,
|
||||
which contains files and directories of each snapshot taken. To restrict
|
||||
access to the ``.snapshot`` directory on the client side, this option
|
||||
should be set to ``false``.
|
||||
|
||||
This parameter defaults to ``true``.
|
||||
|
||||
* Controls visibility of the ``.snapshot`` directory:
|
||||
|
||||
.. code-block:: ini
|
||||
|
||||
infinidat_snapdir_visible = true/false
|
||||
|
||||
By default, each share contains the ``.snapshot`` directory, which is
|
||||
hidden on the client side. To make the ``.snapshot`` directory visible,
|
||||
this option should be set to ``true``.
|
||||
|
||||
This parameter defaults to ``false``.
|
||||
|
||||
Configuration example
|
||||
~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
@ -153,6 +178,8 @@ Configuration example
|
||||
infinidat_pool_name = pool-a
|
||||
infinidat_nas_network_space_name = nas_space
|
||||
infinidat_thin_provision = true
|
||||
infinidat_snapdir_accessible = true
|
||||
infinidat_snapdir_visible = false
|
||||
|
||||
Driver options
|
||||
~~~~~~~~~~~~~~
|
||||
|
||||
@ -23,4 +23,8 @@
|
||||
* - ``infinidat_nas_network_space_name`` = ``None``
|
||||
- (String) Name of the NAS network space on the INFINIDAT InfiniBox.
|
||||
* - ``infinidat_thin_provision`` = ``True``
|
||||
- (Boolean) Use thin provisioning
|
||||
- (Boolean) Use thin provisioning.
|
||||
* - ``infinidat_snapdir_accessible`` = ``True``
|
||||
- (Boolean) Controls access to the ``.snapshot`` directory. By default, each share allows access to its own ``.snapshot`` directory, which contains files and directories of each snapshot taken. To restrict access to the ``.snapshot`` directory, this option should be set to ``False``.
|
||||
* - ``infinidat_snapdir_visible`` = ``False``
|
||||
- (Boolean) Controls visibility of the ``.snapshot`` directory. By default, each share contains the ``.snapshot`` directory, which is hidden on the client side. To make the ``.snapshot`` directory visible, this option should be set to ``True``.
|
||||
|
||||
@ -72,7 +72,22 @@ infinidat_general_opts = [
|
||||
help='Name of the NAS network space on the INFINIDAT '
|
||||
'InfiniBox.'),
|
||||
cfg.BoolOpt('infinidat_thin_provision', help='Use thin provisioning.',
|
||||
default=True)]
|
||||
default=True),
|
||||
cfg.BoolOpt('infinidat_snapdir_accessible',
|
||||
help=('Controls access to the .snapshot directory. '
|
||||
'By default, each share allows access to its own '
|
||||
'.snapshot directory, which contains files and '
|
||||
'directories of each snapshot taken. To restrict '
|
||||
'access to the .snapshot directory, this option '
|
||||
'should be set to False.'),
|
||||
default=True),
|
||||
cfg.BoolOpt('infinidat_snapdir_visible',
|
||||
help=('Controls visibility of the .snapshot directory. '
|
||||
'By default, each share contains the .snapshot '
|
||||
'directory, which is hidden on the client side. '
|
||||
'To make the .snapshot directory visible, this '
|
||||
'option should be set to True.'),
|
||||
default=False), ]
|
||||
|
||||
CONF = cfg.CONF
|
||||
CONF.register_opts(infinidat_connection_opts)
|
||||
@ -105,8 +120,15 @@ def infinisdk_to_manila_exceptions(func):
|
||||
|
||||
|
||||
class InfiniboxShareDriver(driver.ShareDriver):
|
||||
"""INFINIDAT InfiniBox Share driver.
|
||||
|
||||
VERSION = '1.1' # driver version
|
||||
Version history:
|
||||
1.0 - initial release
|
||||
1.1 - added support for TLS/SSL communication
|
||||
1.2 - fixed host assisted migration
|
||||
"""
|
||||
|
||||
VERSION = '1.2' # driver version
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
super(InfiniboxShareDriver, self).__init__(False, *args, **kwargs)
|
||||
@ -364,7 +386,27 @@ class InfiniboxShareDriver(driver.ShareDriver):
|
||||
|
||||
@infinisdk_to_manila_exceptions
|
||||
def _create_filesystem_export(self, infinidat_filesystem):
|
||||
infinidat_export = infinidat_filesystem.add_export(permissions=[])
|
||||
snapdir_visible = self.configuration.infinidat_snapdir_visible
|
||||
infinidat_export = infinidat_filesystem.add_export(
|
||||
permissions=[], snapdir_visible=snapdir_visible)
|
||||
return self._make_export_locations(infinidat_export)
|
||||
|
||||
@infinisdk_to_manila_exceptions
|
||||
def _ensure_filesystem_export(self, infinidat_filesystem):
|
||||
try:
|
||||
infinidat_export = self._get_export(infinidat_filesystem)
|
||||
except exception.ShareBackendException:
|
||||
return self._create_filesystem_export(infinidat_filesystem)
|
||||
actual = infinidat_export.is_snapdir_visible()
|
||||
expected = self.configuration.infinidat_snapdir_visible
|
||||
if actual is not expected:
|
||||
LOG.debug('Update snapdir_visible for %s: %s -> %s',
|
||||
infinidat_filesystem.get_name(), actual, expected)
|
||||
infinidat_export.update_snapdir_visible(expected)
|
||||
return self._make_export_locations(infinidat_export)
|
||||
|
||||
@infinisdk_to_manila_exceptions
|
||||
def _make_export_locations(self, infinidat_export):
|
||||
export_paths = self._get_full_nfs_export_paths(
|
||||
infinidat_export.get_export_path())
|
||||
export_locations = [{
|
||||
@ -422,10 +464,11 @@ class InfiniboxShareDriver(driver.ShareDriver):
|
||||
|
||||
pool = self._get_infinidat_pool()
|
||||
size = share['size'] * capacity.GiB # pylint: disable=no-member
|
||||
share_name = self._make_share_name(share)
|
||||
|
||||
name = self._make_share_name(share)
|
||||
snapdir_accessible = self.configuration.infinidat_snapdir_accessible
|
||||
infinidat_filesystem = self._system.filesystems.create(
|
||||
pool=pool, name=share_name, size=size, provtype=self._provtype)
|
||||
pool=pool, name=name, size=size, provtype=self._provtype,
|
||||
snapdir_accessible=snapdir_accessible)
|
||||
self._set_manila_object_metadata(infinidat_filesystem, share)
|
||||
return self._create_filesystem_export(infinidat_filesystem)
|
||||
|
||||
@ -434,8 +477,10 @@ class InfiniboxShareDriver(driver.ShareDriver):
|
||||
share_server=None, parent_share=None):
|
||||
name = self._make_share_name(share)
|
||||
infinidat_snapshot = self._get_infinidat_snapshot(snapshot)
|
||||
snapdir_accessible = self.configuration.infinidat_snapdir_accessible
|
||||
infinidat_new_share = infinidat_snapshot.create_snapshot(
|
||||
name=name, write_protected=False)
|
||||
name=name, write_protected=False,
|
||||
snapdir_accessible=snapdir_accessible)
|
||||
self._extend_share(infinidat_new_share, share, share['size'])
|
||||
return self._create_filesystem_export(infinidat_new_share)
|
||||
|
||||
@ -445,7 +490,9 @@ class InfiniboxShareDriver(driver.ShareDriver):
|
||||
share = snapshot['share']
|
||||
infinidat_filesystem = self._get_infinidat_filesystem(share)
|
||||
name = self._make_snapshot_name(snapshot)
|
||||
infinidat_snapshot = infinidat_filesystem.create_snapshot(name=name)
|
||||
snapdir_accessible = self.configuration.infinidat_snapdir_accessible
|
||||
infinidat_snapshot = infinidat_filesystem.create_snapshot(
|
||||
name=name, snapdir_accessible=snapdir_accessible)
|
||||
# snapshot is created in the same size as the original share, so no
|
||||
# extending is needed
|
||||
self._set_manila_object_metadata(infinidat_snapshot, snapshot)
|
||||
@ -468,18 +515,32 @@ class InfiniboxShareDriver(driver.ShareDriver):
|
||||
self._delete_share(snapshot, is_snapshot=True)
|
||||
|
||||
def ensure_share(self, context, share, share_server=None):
|
||||
"""Ensure that share is properly configured and exported."""
|
||||
# will raise ShareResourceNotFound if the share was not found:
|
||||
infinidat_filesystem = self._get_infinidat_filesystem(share)
|
||||
try:
|
||||
infinidat_export = self._get_export(infinidat_filesystem)
|
||||
return self._get_full_nfs_export_paths(
|
||||
infinidat_export.get_export_path())
|
||||
except exception.ShareBackendException:
|
||||
# export not found, need to re-export
|
||||
message = ("missing export for share %(share)s, trying to "
|
||||
"re-export")
|
||||
LOG.info(message, {"share": share})
|
||||
return self._create_filesystem_export(infinidat_filesystem)
|
||||
actual = infinidat_filesystem.is_snapdir_accessible()
|
||||
expected = self.configuration.infinidat_snapdir_accessible
|
||||
if actual is not expected:
|
||||
LOG.debug('Update snapdir_accessible for %s: %s -> %s',
|
||||
infinidat_filesystem.get_name(), actual, expected)
|
||||
infinidat_filesystem.update_field('snapdir_accessible', expected)
|
||||
return self._ensure_filesystem_export(infinidat_filesystem)
|
||||
|
||||
def ensure_shares(self, context, shares):
|
||||
"""Invoked to ensure that shares are exported."""
|
||||
updates = {}
|
||||
for share in shares:
|
||||
updates[share['id']] = {
|
||||
'export_locations': self.ensure_share(context, share)}
|
||||
return updates
|
||||
|
||||
def get_backend_info(self, context):
|
||||
snapdir_accessible = self.configuration.infinidat_snapdir_accessible
|
||||
snapdir_visible = self.configuration.infinidat_snapdir_visible
|
||||
return {
|
||||
'snapdir_accessible': snapdir_accessible,
|
||||
'snapdir_visible': snapdir_visible
|
||||
}
|
||||
|
||||
def update_access(self, context, share, access_rules, add_rules,
|
||||
delete_rules, share_server=None):
|
||||
|
||||
@ -16,8 +16,10 @@
|
||||
|
||||
import copy
|
||||
import functools
|
||||
import itertools
|
||||
from unittest import mock
|
||||
|
||||
import ddt
|
||||
from oslo_utils import units
|
||||
|
||||
from manila.common import constants
|
||||
@ -89,28 +91,34 @@ class InfiniboxDriverTestCaseBase(test.TestCase):
|
||||
def setUp(self):
|
||||
super(InfiniboxDriverTestCaseBase, self).setUp()
|
||||
|
||||
# create mock configuration
|
||||
self.configuration = mock.Mock(spec=configuration.Configuration)
|
||||
self.configuration.infinibox_hostname = 'mockbox'
|
||||
self.configuration.infinidat_pool_name = 'mockpool'
|
||||
self.configuration.infinidat_nas_network_space_name = 'mockspace'
|
||||
self.configuration.infinidat_thin_provision = True
|
||||
self.configuration.infinibox_login = 'user'
|
||||
self.configuration.infinibox_password = 'pass'
|
||||
self.configuration.infinidat_use_ssl = False
|
||||
self.configuration.infinidat_suppress_ssl_warnings = False
|
||||
|
||||
self.configuration.network_config_group = 'test_network_config_group'
|
||||
self.configuration.admin_network_config_group = (
|
||||
'test_admin_network_config_group')
|
||||
self.configuration.reserved_share_percentage = 0
|
||||
self.configuration.reserved_share_from_snapshot_percentage = 0
|
||||
self.configuration.reserved_share_extend_percentage = 0
|
||||
self.configuration.filter_function = None
|
||||
self.configuration.goodness_function = None
|
||||
self.configuration.driver_handles_share_servers = False
|
||||
self.configuration.max_over_subscription_ratio = 2
|
||||
self.mock_object(self.configuration, 'safe_get', self._fake_safe_get)
|
||||
self.configuration = configuration.Configuration(None)
|
||||
self.configuration.append_config_values(
|
||||
infinibox.infinidat_connection_opts)
|
||||
self.configuration.append_config_values(
|
||||
infinibox.infinidat_auth_opts)
|
||||
self.configuration.append_config_values(
|
||||
infinibox.infinidat_general_opts)
|
||||
self.override_config('infinibox_hostname', 'mockbox')
|
||||
self.override_config('infinidat_pool_name', 'mockpool')
|
||||
self.override_config('infinidat_nas_network_space_name', 'mockspace')
|
||||
self.override_config('infinidat_thin_provision', True)
|
||||
self.override_config('infinibox_login', 'user')
|
||||
self.override_config('infinibox_password', 'pass')
|
||||
self.override_config('infinidat_use_ssl', False)
|
||||
self.override_config('infinidat_suppress_ssl_warnings', False)
|
||||
self.override_config('network_config_group',
|
||||
'test_network_config_group')
|
||||
self.override_config('admin_network_config_group',
|
||||
'test_admin_network_config_group')
|
||||
self.override_config('reserved_share_percentage', 0)
|
||||
self.override_config('reserved_share_from_snapshot_percentage', 0)
|
||||
self.override_config('reserved_share_extend_percentage', 0)
|
||||
self.override_config('filter_function', None)
|
||||
self.override_config('goodness_function', None)
|
||||
self.override_config('driver_handles_share_servers', False)
|
||||
self.override_config('max_over_subscription_ratio', 2)
|
||||
self.override_config('infinidat_snapdir_accessible', True)
|
||||
self.override_config('infinidat_snapdir_visible', False)
|
||||
|
||||
self.driver = infinibox.InfiniboxShareDriver(
|
||||
configuration=self.configuration)
|
||||
@ -172,9 +180,6 @@ class InfiniboxDriverTestCaseBase(test.TestCase):
|
||||
def _raise_infinisdk(self, *args, **kwargs):
|
||||
raise FakeInfinisdkException()
|
||||
|
||||
def _fake_safe_get(self, value):
|
||||
return getattr(self.configuration, value, None)
|
||||
|
||||
def _fake_get_permissions(self):
|
||||
return self._mock_export_permissions
|
||||
|
||||
@ -190,6 +195,7 @@ class InfiniboxDriverTestCaseBase(test.TestCase):
|
||||
return result
|
||||
|
||||
|
||||
@ddt.ddt
|
||||
class InfiniboxDriverTestCase(InfiniboxDriverTestCaseBase):
|
||||
def _generate_mock_metadata(self, share):
|
||||
return {"system": "openstack",
|
||||
@ -213,14 +219,14 @@ class InfiniboxDriverTestCase(InfiniboxDriverTestCaseBase):
|
||||
self.driver.do_setup, None)
|
||||
|
||||
def test_no_auth_parameters(self):
|
||||
self.configuration.infinibox_login = None
|
||||
self.configuration.infinibox_password = None
|
||||
self.override_config('infinibox_login', None)
|
||||
self.override_config('infinibox_password', None)
|
||||
self.assertRaises(exception.BadConfigurationException,
|
||||
self.driver.do_setup, None)
|
||||
|
||||
def test_empty_auth_parameters(self):
|
||||
self.configuration.infinibox_login = ""
|
||||
self.configuration.infinibox_password = ""
|
||||
self.override_config('infinibox_login', '')
|
||||
self.override_config('infinibox_password', '')
|
||||
self.assertRaises(exception.BadConfigurationException,
|
||||
self.driver.do_setup, None)
|
||||
|
||||
@ -245,10 +251,10 @@ class InfiniboxDriverTestCase(InfiniboxDriverTestCaseBase):
|
||||
'infinisdk.InfiniBox')
|
||||
@mock.patch('requests.packages.urllib3')
|
||||
def test_do_setup_ssl_enabled(self, urllib3, infinibox):
|
||||
self.override_config('infinidat_use_ssl', True)
|
||||
self.override_config('infinidat_suppress_ssl_warnings', True)
|
||||
auth = (self.configuration.infinibox_login,
|
||||
self.configuration.infinibox_password)
|
||||
self.configuration.infinidat_use_ssl = True
|
||||
self.configuration.infinidat_suppress_ssl_warnings = True
|
||||
self.driver.do_setup(None)
|
||||
expected = [
|
||||
mock.call(urllib3.exceptions.InsecureRequestWarning),
|
||||
@ -420,21 +426,28 @@ class InfiniboxDriverTestCase(InfiniboxDriverTestCaseBase):
|
||||
self.driver._get_infinidat_access_level,
|
||||
{'access_level': 'invalid'})
|
||||
|
||||
def test_create_share(self):
|
||||
# This test uses the default infinidat_thin_provision = True setting:
|
||||
@ddt.data(*itertools.product((True, False), (True, False), (True, False)))
|
||||
@ddt.unpack
|
||||
def test_create_share(self, thin_provision, snapdir_accessible,
|
||||
snapdir_visible):
|
||||
self.override_config('infinidat_thin_provision', thin_provision)
|
||||
self.override_config('infinidat_snapdir_accessible',
|
||||
snapdir_accessible)
|
||||
self.override_config('infinidat_snapdir_visible', snapdir_visible)
|
||||
if thin_provision:
|
||||
provtype = 'THIN'
|
||||
else:
|
||||
provtype = 'THICK'
|
||||
self.driver.do_setup(None)
|
||||
self.driver.create_share(None, test_share)
|
||||
self._system.filesystems.create.assert_called_once()
|
||||
share_name = self.driver._make_share_name(test_share)
|
||||
share_size = test_share.size * self._capacity_module.GiB
|
||||
self._system.filesystems.create.assert_called_once_with(
|
||||
pool=self._mock_pool, name=share_name, size=share_size,
|
||||
provtype=provtype, snapdir_accessible=snapdir_accessible)
|
||||
self._validate_metadata(test_share)
|
||||
self._mock_filesystem.add_export.assert_called_once_with(
|
||||
permissions=[])
|
||||
|
||||
def test_create_share_thick_provisioning(self):
|
||||
self.configuration.infinidat_thin_provision = False
|
||||
self.driver.create_share(None, test_share)
|
||||
self._system.filesystems.create.assert_called_once()
|
||||
self._validate_metadata(test_share)
|
||||
self._mock_filesystem.add_export.assert_called_once_with(
|
||||
permissions=[])
|
||||
permissions=[], snapdir_visible=snapdir_visible)
|
||||
|
||||
def test_create_share_pool_not_found(self):
|
||||
self._system.pools.safe_get.return_value = None
|
||||
@ -506,12 +519,19 @@ class InfiniboxDriverTestCase(InfiniboxDriverTestCaseBase):
|
||||
self.assertRaises(exception.ShareBackendException,
|
||||
self.driver.extend_share, test_share, 8)
|
||||
|
||||
def test_create_snapshot(self):
|
||||
@ddt.data(*itertools.product((True, False), (True, False)))
|
||||
@ddt.unpack
|
||||
def test_create_snapshot(self, snapdir_accessible, snapdir_visible):
|
||||
self.override_config('infinidat_snapdir_accessible',
|
||||
snapdir_accessible)
|
||||
self.override_config('infinidat_snapdir_visible', snapdir_visible)
|
||||
snapshot_name = self.driver._make_snapshot_name(test_snapshot)
|
||||
self.driver.create_snapshot(None, test_snapshot)
|
||||
self._mock_filesystem.create_snapshot.assert_called_once()
|
||||
self._mock_filesystem.create_snapshot.assert_called_once_with(
|
||||
name=snapshot_name, snapdir_accessible=snapdir_accessible)
|
||||
self._validate_metadata(test_snapshot)
|
||||
self._mock_filesystem.add_export.assert_called_once_with(
|
||||
permissions=[])
|
||||
permissions=[], snapdir_visible=snapdir_visible)
|
||||
|
||||
def test_create_snapshot_metadata(self):
|
||||
self._mock_filesystem.create_snapshot.return_value = (
|
||||
@ -538,12 +558,21 @@ class InfiniboxDriverTestCase(InfiniboxDriverTestCaseBase):
|
||||
self.assertRaises(exception.ShareBackendException,
|
||||
self.driver.create_snapshot, None, test_snapshot)
|
||||
|
||||
def test_create_share_from_snapshot(self):
|
||||
@ddt.data(*itertools.product((True, False), (True, False)))
|
||||
@ddt.unpack
|
||||
def test_create_share_from_snapshot(self, snapdir_accessible,
|
||||
snapdir_visible):
|
||||
self.override_config('infinidat_snapdir_accessible',
|
||||
snapdir_accessible)
|
||||
self.override_config('infinidat_snapdir_visible', snapdir_visible)
|
||||
share_name = self.driver._make_share_name(original_test_clone)
|
||||
self.driver.create_share_from_snapshot(None, original_test_clone,
|
||||
test_snapshot)
|
||||
self._mock_filesystem.create_snapshot.assert_called_once()
|
||||
self._mock_filesystem.create_snapshot.assert_called_once_with(
|
||||
name=share_name, write_protected=False,
|
||||
snapdir_accessible=snapdir_accessible)
|
||||
self._mock_filesystem.add_export.assert_called_once_with(
|
||||
permissions=[])
|
||||
permissions=[], snapdir_visible=snapdir_visible)
|
||||
|
||||
def test_create_share_from_snapshot_bigger_size(self):
|
||||
test_clone = copy.copy(original_test_clone)
|
||||
@ -589,17 +618,43 @@ class InfiniboxDriverTestCase(InfiniboxDriverTestCaseBase):
|
||||
self.assertRaises(exception.ShareBackendException,
|
||||
self.driver.delete_snapshot, None, test_snapshot)
|
||||
|
||||
def test_ensure_share(self):
|
||||
@ddt.data(*itertools.product((True, False), (True, False),
|
||||
(True, False), (True, False)))
|
||||
@ddt.unpack
|
||||
def test_ensure_share(self, snapdir_accessible_expected,
|
||||
snapdir_accessible_actual,
|
||||
snapdir_visible_expected,
|
||||
snapdir_visible_actual):
|
||||
self.override_config('infinidat_snapdir_accessible',
|
||||
snapdir_accessible_expected)
|
||||
self.override_config('infinidat_snapdir_visible',
|
||||
snapdir_visible_expected)
|
||||
self._mock_filesystem.is_snapdir_accessible.return_value = (
|
||||
snapdir_accessible_actual)
|
||||
self._mock_export.is_snapdir_visible.return_value = (
|
||||
snapdir_visible_actual)
|
||||
self.driver.ensure_share(None, test_share)
|
||||
self._mock_filesystem.get_exports.assert_called_once()
|
||||
self._mock_export.get_export_path.assert_called_once()
|
||||
if snapdir_accessible_actual is not snapdir_accessible_expected:
|
||||
self._mock_filesystem.update_field.assert_called_once_with(
|
||||
'snapdir_accessible', snapdir_accessible_expected)
|
||||
else:
|
||||
self._mock_filesystem.update_field.assert_not_called()
|
||||
if snapdir_visible_actual is not snapdir_visible_expected:
|
||||
self._mock_export.update_snapdir_visible.assert_called_once_with(
|
||||
snapdir_visible_expected)
|
||||
else:
|
||||
self._mock_export.update_snapdir_visible.assert_not_called()
|
||||
|
||||
def test_ensure_share_export_missing(self):
|
||||
@ddt.data(True, False)
|
||||
def test_ensure_share_export_missing(self, snapdir_visible):
|
||||
self.override_config('infinidat_snapdir_visible', snapdir_visible)
|
||||
self._mock_filesystem.get_exports.return_value = []
|
||||
self.driver.ensure_share(None, test_share)
|
||||
self._mock_filesystem.get_exports.assert_called_once()
|
||||
self._mock_filesystem.add_export.assert_called_once_with(
|
||||
permissions=[])
|
||||
permissions=[], snapdir_visible=snapdir_visible)
|
||||
|
||||
def test_ensure_share_share_doesnt_exist(self):
|
||||
self._system.filesystems.safe_get.return_value = None
|
||||
@ -618,6 +673,25 @@ class InfiniboxDriverTestCase(InfiniboxDriverTestCaseBase):
|
||||
self.assertRaises(exception.ShareBackendException,
|
||||
self.driver.ensure_share, None, test_share)
|
||||
|
||||
def test_ensure_shares(self):
|
||||
test_shares = [test_share]
|
||||
test_updates = self.driver.ensure_shares(None, test_shares)
|
||||
self.assertEqual(len(test_shares), len(test_updates))
|
||||
|
||||
@ddt.data(*itertools.product((True, False), (True, False)))
|
||||
@ddt.unpack
|
||||
def test_get_backend_info(self, snapdir_accessible, snapdir_visible):
|
||||
self.override_config('infinidat_snapdir_accessible',
|
||||
snapdir_accessible)
|
||||
self.override_config('infinidat_snapdir_visible',
|
||||
snapdir_visible)
|
||||
expected = {
|
||||
'snapdir_accessible': snapdir_accessible,
|
||||
'snapdir_visible': snapdir_visible
|
||||
}
|
||||
result = self.driver.get_backend_info(None)
|
||||
self.assertEqual(expected, result)
|
||||
|
||||
def test_get_network_allocations_number(self):
|
||||
# Mostly to increase test coverage. The return value should always be 0
|
||||
# for our driver (see method documentation in base class code):
|
||||
|
||||
@ -0,0 +1,21 @@
|
||||
---
|
||||
features:
|
||||
- |
|
||||
The special `.snapshot` directories for shares created by the
|
||||
Infinidat driver can now be controlled through configuration options:
|
||||
`infinidat_snapdir_accessible` and `infinidat_snapdir_visible`.
|
||||
By default, each share allows access to its own `.snapshot` directory,
|
||||
which contains files and directories of each snapshot taken. To restrict
|
||||
access to the `.snapshot` directory, the `infinidat_snapdir_accessible`
|
||||
should be set to `False`. The `infinidat_snapdir_visible` option
|
||||
controls visibility of the `.snapshot` directory. By default, the
|
||||
`.snapshot` directory is hidden. To make the `.snapshot` directory
|
||||
visible on the client side, this option should be set to `True`.
|
||||
fixes:
|
||||
- |
|
||||
Infinidat Driver `bug #1992443
|
||||
<https://bugs.launchpad.net/manila/+bug/1992443>`_:
|
||||
Fixed an issue in Infinidat driver to support host assisted migration.
|
||||
The `snapdir_visible` filesystem property must be disabled to hide
|
||||
`.snapshot` directory on the client side. However, this behavior can
|
||||
be changed using the `infinidat_snapdir_visible` configuration option.
|
||||
Loading…
Reference in New Issue
Block a user