Merge "move NVMEOF exception to target file"

cinder/exception.py

@@ -1213,8 +1213,3 @@ class ServiceUserTokenNoAuth(CinderException):
     message = _("The [service_user] send_service_user_token option was "
                 "requested, but no service auth could be loaded. Please check "
                 "the [service_user] configuration section.")
-
-
-class UnsupportedNVMETProtocol(Invalid):
-    message = _("An invalid 'target_protocol' "
-                "value was provided: %(protocol)s")

cinder/tests/unit/targets/test_nvmeof_driver.py

@@ -133,7 +133,7 @@ class TestNVMeOFDriver(tf.TargetDriverFixture):
 
     def test_invalid_target_protocol(self):
         self.configuration.target_protocol = 'iser'
-        self.assertRaises(exception.UnsupportedNVMETProtocol,
+        self.assertRaises(nvmeof.UnsupportedNVMETProtocol,
                           FakeNVMeOFDriver,
                           root_helper=utils.get_root_helper(),
                           configuration=self.configuration)

cinder/volume/targets/nvmeof.py

@@ -15,12 +15,18 @@ import abc
 from oslo_log import log as logging
 
 from cinder import exception
+from cinder.i18n import _
 from cinder.volume.targets import driver
 
 
 LOG = logging.getLogger(__name__)
 
 
+class UnsupportedNVMETProtocol(exception.Invalid):
+    message = _("An invalid 'target_protocol' "
+                "value was provided: %(protocol)s")
+
+
 class NVMeOF(driver.Target):
 
     """Target object for block storage devices with RDMA transport."""
@@ -44,7 +50,7 @@ class NVMeOF(driver.Target):
             self.nvme_transport_type = self.target_protocol_map[
                 target_protocol]
         else:
-            raise exception.UnsupportedNVMETProtocol(
+            raise UnsupportedNVMETProtocol(
                 protocol=target_protocol
             )