Fix brick remotefs dependency on cinder

This patch moves an exception from cinder.exception
into brick.exception to fix an import in remotefs.

Fixes Bug #1221309

Change-Id: I9b060c1e1129b3fe30145227712d0234e0f42504

diff --git a/cinder/brick/exception.py b/cinder/brick/exception.py
index 74ad7a836ccf57f4b7db4f2d4659b0298bdbbbbe..6995923f63549c0b33305337f621de7abbcf4d88 100644 (file)
--- a/cinder/brick/exception.py
+++ b/cinder/brick/exception.py
@@ -126,3 +126,7 @@ class ISCSITargetRemoveFailed(BrickException):
 
 class ISCSITargetAttachFailed(BrickException):
     message = _("Failed to attach iSCSI target for volume %(volume_id)s.")
+
+
+class ProtocolNotSupported(BrickException):
+    message = _("Connect to volume via protocol %(protocol)s not supported.")

diff --git a/cinder/brick/remotefs/remotefs.py b/cinder/brick/remotefs/remotefs.py
index 5cbc016a7edb07949e8d40da0d0511c7cda18dc0..8812bd6ed8b375a91ba0a1f841e0e27d59981364 100644 (file)
--- a/cinder/brick/remotefs/remotefs.py
+++ b/cinder/brick/remotefs/remotefs.py
@@ -22,7 +22,7 @@ import os
 
 from oslo.config import cfg
 
-from cinder import exception
+from cinder.brick import exception
 from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils as putils

diff --git a/cinder/exception.py b/cinder/exception.py
index 3b5adc167be2da30b63296ec82e9d8ba4a64495d..e28a104f8e25f9d38b5af547312b7b18159cfd08 100644 (file)
--- a/cinder/exception.py
+++ b/cinder/exception.py
@@ -609,10 +609,6 @@ class VolumeMigrationFailed(CinderException):
     message = _("Volume migration failed") + ": %(reason)s"
 
 
-class ProtocolNotSupported(CinderException):
-    message = _("Connect to volume via protocol %(protocol)s not supported.")
-
-
 class SSHInjectionThreat(CinderException):
     message = _("SSH command injection detected") + ": %(command)s"