Remove dothill driver

The Dot Hill driver is no longer supported by an independent CI, so
the driver was marked unsupported in the Ocata release, and is being
disabled in Pike.  The driver code remains in place since it's
subclassed by other drivers (lenovo, hpmsa), but attempting to load
the dothill driver will throw an exception.

DocImpact: Remove description of Dot Hill AssuredSAN driver

UpgradeImpact: Dot Hill storage requires configuration of a new driver.

Change-Id: Ic2cec24ac33813cbce4c3166cc04f32ad3df6396

cinder/exception.py

@@ -1293,6 +1293,10 @@ class DotHillNotTargetPortal(VolumeDriverException):
     message = _("No active iSCSI portals with supplied iSCSI IPs")
 
 
+class DotHillDriverNotSupported(VolumeDriverException):
+    message = _("The Dot Hill driver is no longer supported.")
+
+
 # Sheepdog
 class SheepdogError(VolumeBackendAPIException):
     message = _("An error has occurred in SheepdogDriver. "

cinder/volume/drivers/dothill/dothill_client.py

@@ -98,7 +98,7 @@ class DotHillClient(object):
         raise exception.DotHillConnectionError(
             message=_("Failed to log in to management controller"))
 
-    @utils.synchronized(__name__, external = True)
+    @utils.synchronized(__name__, external=True)
     def _get_session_key(self):
         """Retrieve a session key from the array."""
 

cinder/volume/drivers/dothill/dothill_fc.py

@@ -15,6 +15,7 @@
 #    under the License.
 #
 
+from cinder import exception
 from cinder import interface
 import cinder.volume.driver
 from cinder.volume.drivers.dothill import dothill_common
@@ -22,6 +23,9 @@ from cinder.volume.drivers.san import san
 from cinder.zonemanager import utils as fczm_utils
 
 
+# As of Pike, the DotHill driver is no longer considered supported,
+# but the code remains as it is still subclassed by other drivers.
+# The __init__() function prevents any direct instantiation.
 @interface.volumedriver
 class DotHillFCDriver(cinder.volume.driver.FibreChannelDriver):
     """OpenStack Fibre Channel cinder drivers for DotHill Arrays.
@@ -39,18 +43,13 @@ class DotHillFCDriver(cinder.volume.driver.FibreChannelDriver):
                      - added https support
         1.6    - Add management path redundancy and reduce load placed
                  on management controller.
+        1.7    - Modified so it can't be invoked except as a superclass
     """
 
-    VERSION = "1.6"
-
-    # ThirdPartySystems CI wiki
-    CI_WIKI_NAME = "Vedams_DotHillDriver_CI"
-
-    # TODO(smcginnis) Either remove this if CI requirements are met, or
-    # remove this driver in the Pike release per normal deprecation
-    SUPPORTED = False
-
     def __init__(self, *args, **kwargs):
+        # Make sure we're not invoked directly
+        if type(self) == DotHillFCDriver:
+            raise exception.DotHillDriverNotSupported
         super(DotHillFCDriver, self).__init__(*args, **kwargs)
         self.common = None
         self.configuration.append_config_values(dothill_common.common_opts)

cinder/volume/drivers/dothill/dothill_iscsi.py

@@ -29,6 +29,9 @@ DEFAULT_ISCSI_PORT = "3260"
 LOG = logging.getLogger(__name__)
 
 
+# As of Pike, the DotHill driver is no longer considered supported,
+# but the code remains as it is still subclassed by other drivers.
+# The __init__() function prevents any direct instantiation.
 @interface.volumedriver
 class DotHillISCSIDriver(cinder.volume.driver.ISCSIDriver):
     """OpenStack iSCSI cinder drivers for DotHill Arrays.
@@ -48,18 +51,13 @@ class DotHillISCSIDriver(cinder.volume.driver.ISCSIDriver):
                      - added https support
         1.6    - Add management path redundancy and reduce load placed
                  on management controller.
+        1.7    - Modified so it can't be invoked except as a superclass
     """
 
-    VERSION = "1.6"
-
-    # ThirdPartySystems CI wiki
-    CI_WIKI_NAME = "Vedams_DotHillDriver_CI"
-
-    # TODO(smcginnis) Either remove this if CI requirements are met, or
-    # remove this driver in the Pike release per normal deprecation
-    SUPPORTED = False
-
     def __init__(self, *args, **kwargs):
+        # Make sure we're not invoked directly
+        if type(self) == DotHillISCSIDriver:
+            raise exception.DotHillDriverNotSupported
         super(DotHillISCSIDriver, self).__init__(*args, **kwargs)
         self.common = None
         self.configuration.append_config_values(dothillcommon.common_opts)

releasenotes/notes/dothill-drivers-removed-da00a6b83865271a.yaml

@@ -0,0 +1,3 @@
+---
+upgrade:
+  - Support for Dot Hill AssuredSAN arrays has been removed.