openstack
/
manila
Code Issues Proposed changes

Merge "Dell EMC: Drop "vmax" alias"

This commit is contained in:
Zuul 2024-02-16 17:17:30 +00:00 committed by Gerrit Code Review
parent 05a231e370 aabbd02598
commit 179a1e7a4d
5 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/source/admin/share_back_ends_feature_support_mapping.rst
View File

@ -43,7 +43,7 @@ Mapping of share drivers and share features support
+----------------------------------------+-----------------------+-----------------------+--------------------------+--------------------------+------------------------+-----------------------------------+--------------------------+--------------------+--------------------+
| NetApp Clustered Data ONTAP | J | L | L | L | J |same pool (J), across back ends (U)| N | O | \- |
+----------------------------------------+-----------------------+-----------------------+--------------------------+--------------------------+------------------------+-----------------------------------+--------------------------+--------------------+--------------------+
| EMC VMAX | O | \- | O | \- | O | O | \- | \- | \- |
| Dell EMC PowerMax | O | \- | O | \- | O | O | \- | \- | \- |
+----------------------------------------+-----------------------+-----------------------+--------------------------+--------------------------+------------------------+-----------------------------------+--------------------------+--------------------+--------------------+
| EMC VNX | J | \- | \- | \- | J | J | \- | \- | \- |
+----------------------------------------+-----------------------+-----------------------+--------------------------+--------------------------+------------------------+-----------------------------------+--------------------------+--------------------+--------------------+
@ -120,7 +120,7 @@ Mapping of share drivers and share access rules support
+----------------------------------------+--------------+--------------+----------------+------------+--------------+--------------+--------------+----------------+------------+------------+
| NetApp Clustered Data ONTAP | NFS (J) | NFS (Q) | CIFS (J) | \- | \- | NFS (K) | NFS (Q) | CIFS (M) | \- | \- |
+----------------------------------------+--------------+--------------+----------------+------------+--------------+--------------+--------------+----------------+------------+------------+
| EMC VMAX | NFS (O) | NFS (R) | CIFS (O) | \- | \- | NFS (O) | NFS (R) | CIFS (O) | \- | \- |
| Dell EMC PowerMax | NFS (O) | NFS (R) | CIFS (O) | \- | \- | NFS (O) | NFS (R) | CIFS (O) | \- | \- |
+----------------------------------------+--------------+--------------+----------------+------------+--------------+--------------+--------------+----------------+------------+------------+
| EMC VNX | NFS (J) | NFS (Q) | CIFS (J) | \- | \- | NFS (L) | NFS (Q) | CIFS (L) | \- | \- |
+----------------------------------------+--------------+--------------+----------------+------------+--------------+--------------+--------------+----------------+------------+------------+
@ -195,7 +195,7 @@ Mapping of share drivers and security services support
+----------------------------------------+------------------+-----------------+------------------+
| NetApp Clustered Data ONTAP | J | J | J |
+----------------------------------------+------------------+-----------------+------------------+
| EMC VMAX | O | \- | \- |
| Dell EMC PowerMax | O | \- | \- |
+----------------------------------------+------------------+-----------------+------------------+
| EMC VNX | J | \- | \- |
+----------------------------------------+------------------+-----------------+------------------+
@ -272,7 +272,7 @@ More information: :ref:`capabilities_and_extra_specs`
+----------------------------------------+-----------+------------+--------+-------------+-------------------+--------------------+-----+----------------------------+--------------------+--------------------+--------------+--------------+-------------------------+
| NetApp Clustered Data ONTAP | J | K | M | M | M | L | P | J | O | \- | P | Q | \- |
+----------------------------------------+-----------+------------+--------+-------------+-------------------+--------------------+-----+----------------------------+--------------------+--------------------+--------------+--------------+-------------------------+
| EMC VMAX | O | \- | \- | \- | \- | \- | \- | O | \- | \- | P | R | \- |
| Dell EMC PowerMax | O | \- | \- | \- | \- | \- | \- | O | \- | \- | P | R | \- |
+----------------------------------------+-----------+------------+--------+-------------+-------------------+--------------------+-----+----------------------------+--------------------+--------------------+--------------+--------------+-------------------------+
| EMC VNX | J | \- | \- | \- | \- | L | \- | J | \- | \- | P | Q | \- |
+----------------------------------------+-----------+------------+--------+-------------+-------------------+--------------------+-----+----------------------------+--------------------+--------------------+--------------+--------------+-------------------------+

8
manila/share/drivers/dell_emc/driver.py
View File

@ -41,7 +41,7 @@ EMC_NAS_OPTS = [
help='Use secure connection to server.'),
cfg.StrOpt('emc_share_backend',
ignore_case=True,
choices=['isilon', 'vnx', 'unity', 'vmax', 'powermax',
choices=['isilon', 'vnx', 'unity', 'powermax',
'powerstore', 'powerflex'],
help='Share backend.'),
cfg.StrOpt('emc_nas_root_dir',
@ -76,12 +76,6 @@ class EMCShareDriver(driver.ShareDriver):
self.backend_name = self.backend_name or 'EMC_NAS_Storage'
self.plugin_manager = manager.EMCPluginManager(
namespace='manila.share.drivers.dell_emc.plugins')
if self.backend_name == 'vmax':
LOG.warning("Configuration option 'emc_share_backend=vmax' will "
"remain a valid option until the V release of "
"OpenStack. After that, only "
"'emc_share_backend=powermax' will be excepted.")
self.backend_name = 'powermax'
LOG.info("BACKEND IS: %s", self.backend_name)
self.plugin = self.plugin_manager.load_plugin(
self.backend_name,

6
manila/tests/share/drivers/dell_emc/common/enas/fakes.py
View File

@ -1732,9 +1732,3 @@ STATS = dict(
vendor_name='EMC',
storage_protocol='NFS_CIFS',
driver_version='2.0.0,')
STATS_VMAX = dict(
share_backend_name='VMAX',
vendor_name='EMC',
storage_protocol='NFS_CIFS',
driver_version='2.0.0,')

23
manila/tests/share/drivers/dell_emc/test_driver.py
View File

@ -79,7 +79,7 @@ class FakeConnection(base.StorageConnection):
"""Teardown share server."""
class FakeConnection_vmax(FakeConnection):
class FakeConnection_powermax(FakeConnection):
def __init__(self, *args, **kwargs):
self.dhss_mandatory_security_service_association = {}
self.revert_to_snap_support = False
@ -94,7 +94,6 @@ class FakeConnection_vmax(FakeConnection):
FAKE_BACKEND = 'fake_backend'
FAKE_BACKEND_VMAX = 'vmax'
FAKE_BACKEND_POWERMAX = 'powermax'
@ -108,7 +107,7 @@ class FakeEMCExtensionManager(object):
obj=None))
self.extensions.append(
extension.Extension(name=FAKE_BACKEND_POWERMAX,
plugin=FakeConnection_vmax,
plugin=FakeConnection_powermax,
entry_point=None,
obj=None))
@ -126,14 +125,14 @@ class EMCShareFrameworkTestCase(test.TestCase):
self.driver = emcdriver.EMCShareDriver(
configuration=self.configuration)
self.configuration_vmax = conf.Configuration(None)
self.configuration_vmax.append_config_values = \
self.configuration_powermax = conf.Configuration(None)
self.configuration_powermax.append_config_values = \
mock.Mock(return_value=0)
self.configuration_vmax.share_backend_name = FAKE_BACKEND_VMAX
self.mock_object(self.configuration_vmax, 'safe_get',
self._fake_safe_get_vmax)
self.driver_vmax = emcdriver.EMCShareDriver(
configuration=self.configuration_vmax)
self.configuration_powermax.share_backend_name = FAKE_BACKEND_POWERMAX
self.mock_object(self.configuration_powermax, 'safe_get',
self._fake_safe_get_powermax)
self.driver_powermax = emcdriver.EMCShareDriver(
configuration=self.configuration_powermax)
def test_driver_setup(self):
FakeConnection.connect = mock.Mock()
@ -185,9 +184,9 @@ class EMCShareFrameworkTestCase(test.TestCase):
return True
return None
def _fake_safe_get_vmax(self, value):
def _fake_safe_get_powermax(self, value):
if value in ['emc_share_backend', 'share_backend_name']:
return FAKE_BACKEND_VMAX
return FAKE_BACKEND_POWERMAX
elif value == 'driver_handles_share_servers':
return True
return None

5
releasenotes/notes/remove-vmax-a3d97ba80ced4895.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- |
The ``emc_share_backend`` option no longer supports ``vmax``. Use
``powermax`` instead.