Removing deprecated Dell EqualLogic config options

These have been deprecated for longer than the standard deprecation
period, which include eqlx_cli_timeout, eqlx_use_chap, eqlx_chap_login,
eqlx_chap_password. Instead the standard ones Cinder provides should be
used.

DocImpact

Change-Id: I53df63e218056ac7afa08bea3828d45d00400422

cinder/releasenotes/notes/remove-eqlx-deprecated-options-89ba02c41d4da62a.yaml

@@ -0,0 +1,15 @@
+---
+upgrade:
+  - |
+
+    Removing the Dell EqualLogic driver's deprecated configuration options.
+    Please replace old options in your cinder.conf with the new one.
+
+    * Removed - eqlx_cli_timeout
+    * Replaced with - ssh_conn_timeout
+    * Removed - eqlx_use_chap
+    * Replaced with - use_chap_auth
+    * Removed - eqlx_chap_login
+    * Replaced with - chap_username
+    * Removed - eqlx_chap_password
+    * Replaced with - chap_password

cinder/tests/unit/volume/drivers/test_eqlx.py

@@ -48,10 +48,8 @@ class DellEQLSanISCSIDriverTestCase(test.TestCase):
         self.configuration.ssh_conn_timeout = 30
         self.configuration.eqlx_pool = 'non-default'
         self.configuration.eqlx_group_name = 'group-0'
-        self.configuration.eqlx_cli_timeout = 30
         self.configuration.eqlx_cli_max_retries = 5
 
-        self.configuration.eqlx_use_chap = False
         self.configuration.use_chap_auth = True
         self.configuration.chap_username = 'admin'
         self.configuration.chap_password = 'password'

cinder/volume/driver.py

@@ -38,10 +38,6 @@ from cinder.volume import throttling
 LOG = logging.getLogger(__name__)
 
 
-deprecated_use_chap_auth_opts = [cfg.DeprecatedOpt('eqlx_use_chap')]
-deprecated_chap_username_opts = [cfg.DeprecatedOpt('eqlx_chap_login')]
-deprecated_chap_password_opts = [cfg.DeprecatedOpt('eqlx_chap_password')]
-
 volume_opts = [
     cfg.IntOpt('num_shell_tries',
                default=3,
@@ -179,16 +175,13 @@ volume_opts = [
     cfg.BoolOpt('use_chap_auth',
                 default=False,
                 help='Option to enable/disable CHAP authentication for '
-                     'targets.',
+                     'targets.'),
-                deprecated_opts=deprecated_use_chap_auth_opts),
     cfg.StrOpt('chap_username',
                default='',
-               help='CHAP user name.',
+               help='CHAP user name.'),
-               deprecated_opts=deprecated_chap_username_opts),
     cfg.StrOpt('chap_password',
                default='',
                help='Password for specified CHAP account name.',
-               deprecated_opts=deprecated_chap_password_opts,
                secret=True),
     cfg.StrOpt('driver_data_namespace',
                help='Namespace for driver private data values to be '

cinder/volume/drivers/eqlx.py

@@ -25,7 +25,6 @@ import greenlet
 from oslo_concurrency import processutils
 from oslo_config import cfg
 from oslo_log import log as logging
-from oslo_log import versionutils
 from oslo_utils import excutils
 from six.moves import range
 
@@ -43,36 +42,10 @@ eqlx_opts = [
                default='group-0',
                help='Group name to use for creating volumes. Defaults to '
                     '"group-0".'),
-    cfg.IntOpt('eqlx_cli_timeout',
-               default=30,
-               help='Timeout for the Group Manager cli command execution. '
-                    'Default is 30. Note that this option is deprecated '
-                    'in favour of "ssh_conn_timeout" as '
-                    'specified in cinder/volume/drivers/san/san.py '
-                    'and will be removed in M release.'),
     cfg.IntOpt('eqlx_cli_max_retries',
                min=0,
                default=5,
                help='Maximum retry count for reconnection. Default is 5.'),
-    cfg.BoolOpt('eqlx_use_chap',
-                default=False,
-                help='Use CHAP authentication for targets. Note that this '
-                     'option is deprecated in favour of "use_chap_auth" as '
-                     'specified in cinder/volume/driver.py and will be '
-                     'removed in next release.'),
-    cfg.StrOpt('eqlx_chap_login',
-               default='admin',
-               help='Existing CHAP account name. Note that this '
-                    'option is deprecated in favour of "chap_username" as '
-                    'specified in cinder/volume/driver.py and will be '
-                    'removed in next release.'),
-    cfg.StrOpt('eqlx_chap_password',
-               default='password',
-               help='Password for specified CHAP account name. Note that this '
-                    'option is deprecated in favour of "chap_password" as '
-                    'specified in cinder/volume/driver.py and will be '
-                    'removed in the next release',
-               secret=True),
     cfg.StrOpt('eqlx_pool',
                default='default',
                help='Pool in which volumes will be created. Defaults '
@@ -158,10 +131,12 @@ class DellEQLSanISCSIDriver(san.SanISCSIDriver):
         1.1.0 - Misc fixes
         1.2.0 - Deprecated eqlx_cli_timeout infavor of ssh_conn_timeout
         1.3.0 - Added support for manage/unmanage volume
+        1.4.0 - Removed deprecated options eqlx_cli_timeout, eqlx_use_chap,
+                eqlx_chap_login, and eqlx_chap_password.
 
     """
 
-    VERSION = "1.3.0"
+    VERSION = "1.4.0"
 
     # ThirdPartySytems wiki page
     CI_WIKI_NAME = "Dell_Storage_CI"
@@ -172,28 +147,6 @@ class DellEQLSanISCSIDriver(san.SanISCSIDriver):
         self._group_ip = None
         self.sshpool = None
 
-        if self.configuration.eqlx_use_chap is True:
-            LOG.warning(_LW(
-                'Configuration options eqlx_use_chap, '
-                'eqlx_chap_login and eqlx_chap_password are deprecated. Use '
-                'use_chap_auth, chap_username and chap_password '
-                'respectively for the same.'))
-
-            self.configuration.use_chap_auth = (
-                self.configuration.eqlx_use_chap)
-            self.configuration.chap_username = (
-                self.configuration.eqlx_chap_login)
-            self.configuration.chap_password = (
-                self.configuration.eqlx_chap_password)
-
-        if self.configuration.eqlx_cli_timeout:
-            msg = _LW('Configuration option eqlx_cli_timeout '
-                      'is deprecated and will be removed in M release. '
-                      'Use ssh_conn_timeout instead.')
-            self.configuration.ssh_conn_timeout = (
-                self.configuration.eqlx_cli_timeout)
-            versionutils.report_deprecated_feature(LOG, msg)
-
     def _get_output(self, chan):
         out = ''
         ending = '%s> ' % self.configuration.eqlx_group_name