brick.patch

diff --git a/os_brick/initiator/AoEConnector.py b/os_brick/initiator/AoEConnector.py
index 6d7acbb..2ccea9d 100644
--- a/os_brick/initiator/AoEConnector.py
+++ b/os_brick/initiator/AoEConnector.py
@@ -28,7 +28,7 @@ DEVICE_SCAN_ATTEMPTS_DEFAULT = 3
 LOG = logging.getLogger(__name__)
 
 
-class AoEConnector(InitiatorConnector):
+class AoEConnector(InitiatorConnector.InitiatorConnector):
     """Connector class to attach/detach AoE volumes."""
     def __init__(self, root_helper, driver=None,
                  execute=putils.execute,
diff --git a/os_brick/initiator/DISCOConnector.py b/os_brick/initiator/DISCOConnector.py
index 4fbfb79..042f3d6 100644
--- a/os_brick/initiator/DISCOConnector.py
+++ b/os_brick/initiator/DISCOConnector.py
@@ -32,7 +32,7 @@ DEVICE_SCAN_ATTEMPTS_DEFAULT = 3
 synchronized = lockutils.synchronized_with_prefix('os-brick-')
 
 
-class DISCOConnector(InitiatorConnector):
+class DISCOConnector(InitiatorConnector.InitiatorConnector):
     """Class implements the connector driver for DISCO."""
 
     DISCO_PREFIX = 'dms'
diff --git a/os_brick/initiator/DRBDConnector.py b/os_brick/initiator/DRBDConnector.py
index 6d4bf3e..b032d9d 100644
--- a/os_brick/initiator/DRBDConnector.py
+++ b/os_brick/initiator/DRBDConnector.py
@@ -20,7 +20,7 @@ from oslo_concurrency import processutils as putils
 from os_brick.initiator import InitiatorConnector
 
 
-class DRBDConnector(InitiatorConnector):
+class DRBDConnector(InitiatorConnector.InitiatorConnector):
     """"Connector class to attach/detach DRBD resources."""
 
     def __init__(self, root_helper, driver=None,
diff --git a/os_brick/initiator/FCConnector.py b/os_brick/initiator/FCConnector.py
index 7af54cb..42c4fc6 100644
--- a/os_brick/initiator/FCConnector.py
+++ b/os_brick/initiator/FCConnector.py
@@ -37,7 +37,7 @@ MULTIPATH_PATH_CHECK_REGEX = re.compile("\s+\d+:\d+:\d+:\d+\s+")
 LOG = logging.getLogger(__name__)
 
 
-class FibreChannelConnector(InitiatorConnector):
+class FibreChannelConnector(InitiatorConnector.InitiatorConnector):
     """Connector class to attach/detach Fibre Channel volumes."""
 
     def __init__(self, root_helper, driver=None,
diff --git a/os_brick/initiator/FCConnectorS390X.py b/os_brick/initiator/FCConnectorS390X.py
index 2dff0e1..b83a5ca 100644
--- a/os_brick/initiator/FCConnectorS390X.py
+++ b/os_brick/initiator/FCConnectorS390X.py
@@ -24,7 +24,7 @@ DEVICE_SCAN_ATTEMPTS_DEFAULT = 3
 LOG = logging.getLogger(__name__)
 
 
-class FibreChannelConnectorS390X(FibreChannelConnector):
+class FibreChannelConnectorS390X(FibreChannelConnector.FibreChannelConnector):
     """Connector class to attach/detach Fibre Channel volumes on S390X arch."""
 
     def __init__(self, root_helper, driver=None,
diff --git a/os_brick/initiator/HGSTConnector.py b/os_brick/initiator/HGSTConnector.py
index 5cfecc9..07b702e 100644
--- a/os_brick/initiator/HGSTConnector.py
+++ b/os_brick/initiator/HGSTConnector.py
@@ -27,7 +27,7 @@ DEVICE_SCAN_ATTEMPTS_DEFAULT = 3
 LOG = logging.getLogger(__name__)
 
 
-class HGSTConnector(InitiatorConnector):
+class HGSTConnector(InitiatorConnector.InitiatorConnector):
     """Connector class to attach/detach HGST volumes."""
     VGCCLUSTER = 'vgc-cluster'
 
diff --git a/os_brick/initiator/HuaweiStorHyperConnector.py b/os_brick/initiator/HuaweiStorHyperConnector.py
index 5a5081f..118673b 100644
--- a/os_brick/initiator/HuaweiStorHyperConnector.py
+++ b/os_brick/initiator/HuaweiStorHyperConnector.py
@@ -27,7 +27,7 @@ LOG = logging.getLogger(__name__)
 synchronized = lockutils.synchronized_with_prefix('os-brick-')
 
 
-class HuaweiStorHyperConnector(InitiatorConnector):
+class HuaweiStorHyperConnector(InitiatorConnector.InitiatorConnector):
     """"Connector class to attach/detach SDSHypervisor volumes."""
     attached_success_code = 0
     has_been_attached_code = 50151401
diff --git a/os_brick/initiator/ISCSIConnector.py b/os_brick/initiator/ISCSIConnector.py
index 595e1fd..b19fcc9 100644
--- a/os_brick/initiator/ISCSIConnector.py
+++ b/os_brick/initiator/ISCSIConnector.py
@@ -39,7 +39,7 @@ MULTIPATH_PATH_CHECK_REGEX = re.compile("\s+\d+:\d+:\d+:\d+\s+")
 LOG = logging.getLogger(__name__)
 
 
-class ISCSIConnector(InitiatorConnector):
+class ISCSIConnector(InitiatorConnector.InitiatorConnector):
     """Connector class to attach/detach iSCSI volumes."""
     supported_transports = ['be2iscsi', 'bnx2i', 'cxgb3i', 'default',
                             'cxgb4i', 'qla4xxx', 'ocs', 'iser']
diff --git a/os_brick/initiator/InitiatorConnector.py b/os_brick/initiator/InitiatorConnector.py
index 4dd4b99..927ddd8 100644
--- a/os_brick/initiator/InitiatorConnector.py
+++ b/os_brick/initiator/InitiatorConnector.py
@@ -27,7 +27,6 @@ from os_brick import executor
 from os_brick.initiator import host_driver
 from os_brick.initiator import linuxscsi
 from os_brick.i18n import _LE, _LW
-from os_brick.initiator import utils as connector_utils
 
 DEVICE_SCAN_ATTEMPTS_DEFAULT = 3
 LOG = logging.getLogger(__name__)
@@ -75,17 +74,6 @@ class InitiatorConnector(executor.Executor):
 
         return props
 
-    @staticmethod
-    def factory(protocol, root_helper, driver=None,
-                use_multipath=False,
-                device_scan_attempts=DEVICE_SCAN_ATTEMPTS_DEFAULT,
-                arch=None,
-                *args, **kwargs):
-        return connector_utils.connector_factory(
-            protocol, root_helper, driver=driver, use_multipath=use_multipath,
-            device_scan_attempts=device_scan_attempts, arch=arch, *args,
-            **kwargs)
-
     def check_valid_device(self, path, run_as_root=True):
         """Test to see if the device path is a real device.
 
diff --git a/os_brick/initiator/LocalConnector.py b/os_brick/initiator/LocalConnector.py
index 2e9206e..f63bb5e 100644
--- a/os_brick/initiator/LocalConnector.py
+++ b/os_brick/initiator/LocalConnector.py
@@ -18,7 +18,7 @@ from os_brick.i18n import _
 from os_brick.initiator import InitiatorConnector
 
 
-class LocalConnector(InitiatorConnector):
+class LocalConnector(InitiatorConnector.InitiatorConnector):
     """"Connector class to attach/detach File System backed volumes."""
 
     def __init__(self, root_helper, driver=None, execute=putils.execute,
diff --git a/os_brick/initiator/RBDConnector.py b/os_brick/initiator/RBDConnector.py
index b026173..a999b53 100644
--- a/os_brick/initiator/RBDConnector.py
+++ b/os_brick/initiator/RBDConnector.py
@@ -26,7 +26,7 @@ DEVICE_SCAN_ATTEMPTS_DEFAULT = 3
 LOG = logging.getLogger(__name__)
 
 
-class RBDConnector(InitiatorConnector):
+class RBDConnector(InitiatorConnector.InitiatorConnector):
     """"Connector class to attach/detach RBD volumes."""
 
     def __init__(self, root_helper, driver=None,
diff --git a/os_brick/initiator/RemoteFsConnector.py b/os_brick/initiator/RemoteFsConnector.py
index d6f17e8..48b3a80 100644
--- a/os_brick/initiator/RemoteFsConnector.py
+++ b/os_brick/initiator/RemoteFsConnector.py
@@ -23,7 +23,7 @@ DEVICE_SCAN_ATTEMPTS_DEFAULT = 3
 LOG = logging.getLogger(__name__)
 
 
-class RemoteFsConnector(InitiatorConnector):
+class RemoteFsConnector(InitiatorConnector.InitiatorConnector):
     """Connector class to attach/detach NFS and GlusterFS volumes."""
 
     def __init__(self, mount_type, root_helper, driver=None,
diff --git a/os_brick/initiator/ScaleIOConnector.py b/os_brick/initiator/ScaleIOConnector.py
index aac4eac..3283cea 100644
--- a/os_brick/initiator/ScaleIOConnector.py
+++ b/os_brick/initiator/ScaleIOConnector.py
@@ -31,7 +31,7 @@ LOG = logging.getLogger(__name__)
 DEVICE_SCAN_ATTEMPTS_DEFAULT = 3
 
 
-class ScaleIOConnector(InitiatorConnector):
+class ScaleIOConnector(InitiatorConnector.InitiatorConnector):
     """Class implements the connector driver for ScaleIO."""
     OK_STATUS_CODE = 200
     VOLUME_NOT_MAPPED_ERROR = 84
diff --git a/os_brick/initiator/SheepdogConnector.py b/os_brick/initiator/SheepdogConnector.py
index b61664c..7ef05ae 100644
--- a/os_brick/initiator/SheepdogConnector.py
+++ b/os_brick/initiator/SheepdogConnector.py
@@ -25,7 +25,7 @@ DEVICE_SCAN_ATTEMPTS_DEFAULT = 3
 LOG = logging.getLogger(__name__)
 
 
-class SheepdogConnector(InitiatorConnector):
+class SheepdogConnector(InitiatorConnector.InitiatorConnector):
     """"Connector class to attach/detach sheepdog volumes."""
 
     def __init__(self, root_helper, driver=None,
diff --git a/os_brick/initiator/connector.py b/os_brick/initiator/connector.py
index 0b1b6bf..61c3ebe 100644
--- a/os_brick/initiator/connector.py
+++ b/os_brick/initiator/connector.py
@@ -26,6 +26,7 @@ import socket
 import sys
 
 from os_brick import utils
+from os_brick.initiator import utils as connector_utils
 
 from oslo_concurrency import lockutils
 from oslo_log import log as logging
@@ -48,19 +49,18 @@ OS_TYPE_LINUX = 'LINUX'
 
 
 connector_list = [
-    'os_brick.initiator.connector.InitiatorConnector',
-    'os_brick.initiator.ISCSIConnector',
-    'os_brick.initiator.FibreChannelConnector',
-    'os_brick.initiator.FibreChannelConnectorS390X',
-    'os_brick.initiator.AoEConnector',
-    'os_brick.initiator.RemoteFsConnector',
-    'os_brick.initiator.RBDConnector',
-    'os_brick.initiator.LocalConnector',
-    'os_brick.initiator.DRBDConnector',
-    'os_brick.initiator.HuaweiStorHyperConnector',
-    'os_brick.initiator.HGSTConnector',
-    'os_brick.initiator.ScaleIOConnector',
-    'os_brick.initiator.DISCOConnector',
+    'os_brick.initiator.ISCSIConnector.ISCSIConnector',
+    'os_brick.initiator.FCConnector.FibreChannelConnector',
+    'os_brick.initiator.FCConnectorS390X.FibreChannelConnectorS390X',
+    'os_brick.initiator.AoEConnector.AoEConnector',
+    'os_brick.initiator.RemoteFsConnector.RemoteFsConnector',
+    'os_brick.initiator.RBDConnector.RBDConnector',
+    'os_brick.initiator.LocalConnector.LocalConnector',
+    'os_brick.initiator.DRBDConnector.DRBDConnector',
+    'os_brick.initiator.HuaweiStorHyperConnector.HuaweiStorHyperConnector',
+    'os_brick.initiator.HGSTConnector.HGSTConnector',
+    'os_brick.initiator.ScaleIOConnector.ScaleIOConnector',
+    'os_brick.initiator.DISCOConnector.DISCOConnector',
 ]
 
 
@@ -95,9 +95,13 @@ def get_connector_properties(root_helper, my_ip, multipath, enforce_multipath,
     props['os_type'] = sys.platform
     props['ip'] = my_ip
     props['host'] = host if host else socket.gethostname()
+    import pprint
 
     for item in connector_list:
+        pprint.pprint(item)
+
         connector = importutils.import_class(item)
+        pprint.pprint(connector)
 
         if (utils.platform_matches(props['platform'], connector.platform) and
            utils.os_matches(props['os_type'], connector.os_type)):
@@ -111,3 +115,18 @@ def get_connector_properties(root_helper, my_ip, multipath, enforce_multipath,
                                          execute=execute))
 
     return props
+
+
+class InitiatorConnector(object):
+    """This is exist to maintain backwards compatibility."""
+
+    @staticmethod
+    def factory(protocol, root_helper, driver=None,
+                use_multipath=False,
+                device_scan_attempts=DEVICE_SCAN_ATTEMPTS_DEFAULT,
+                arch=None,
+                *args, **kwargs):
+        return connector_utils.connector_factory(
+            protocol, root_helper, driver=driver, use_multipath=use_multipath,
+            device_scan_attempts=device_scan_attempts, arch=arch, *args,
+            **kwargs)