Merge "Raise specific exception for an invalid protocol connector"

os_brick/exception.py

@@ -154,3 +154,8 @@ class InvalidIOHandleObject(BrickException):
 class VolumeEncryptionNotSupported(Invalid):
     message = _("Volume encryption is not supported for %(volume_type)s "
                 "volume %(volume_id)s.")
+
+
+# NOTE(mriedem): This extends ValueError to maintain backward compatibility.
+class InvalidConnectorProtocol(ValueError):
+    pass

os_brick/initiator/connector.py

@@ -29,6 +29,7 @@ from oslo_concurrency import lockutils
 from oslo_log import log as logging
 from oslo_utils import importutils
 
+from os_brick import exception
 from os_brick.i18n import _
 from os_brick import initiator
 from os_brick import utils
@@ -282,7 +283,7 @@ class InitiatorConnector(object):
             msg = (_("Invalid InitiatorConnector protocol "
                      "specified %(protocol)s") %
                    dict(protocol=protocol))
-            raise ValueError(msg)
+            raise exception.InvalidConnectorProtocol(msg)
 
         conn_cls = importutils.import_class(connector)
         return conn_cls(*args, **kwargs)

os_brick/tests/initiator/test_connector.py

@@ -18,6 +18,7 @@ import sys
 import mock
 from oslo_concurrency import processutils as putils
 
+from os_brick import exception
 from os_brick.initiator import connector
 from os_brick.initiator.connectors import base
 from os_brick.initiator.connectors import fake
@@ -222,7 +223,7 @@ class ConnectorTestCase(test_base.TestCase):
         obj = connector.InitiatorConnector.factory("disco", None)
         self.assertEqual("DISCOConnector", obj.__class__.__name__)
 
-        self.assertRaises(ValueError,
+        self.assertRaises(exception.InvalidConnectorProtocol,
                           connector.InitiatorConnector.factory,
                           "bogus", None)