From 522c640bc3ee003e704858cc68c579d065cb7d29 Mon Sep 17 00:00:00 2001 From: Silvan Kaiser Date: Tue, 23 Dec 2014 17:35:46 +0100 Subject: [PATCH] Quobyte Driver Exception Cleanup Clean up deprecated vendor specific exception code in Quobyte Cinder Driver. Removes superfluous exceptions, uses standard Cinder exceptions instead. Change-Id: I3225915a5f90ae22093d3c590fb04fbf28fc2573 Implements: blueprint qb-drv-exception-cleanup --- cinder/exception.py | 9 --------- cinder/volume/drivers/quobyte.py | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/cinder/exception.py b/cinder/exception.py index 6c9273af2..112d0f912 100644 --- a/cinder/exception.py +++ b/cinder/exception.py @@ -822,15 +822,6 @@ class NetAppDriverException(VolumeDriverException): message = _("NetApp Cinder Driver exception.") -# Quobyte USP -class QuobyteException(VolumeDriverException): - message = _("Unknown Quobyte exception") - - -class QuobyteVolumeNotMounted(NotFound): - message = _("No mounted Quobyte volumes found") - - class EMCVnxCLICmdError(VolumeBackendAPIException): def __init__(self, cmd=None, rc=None, out='', log_as_error=True, **kwargs): diff --git a/cinder/volume/drivers/quobyte.py b/cinder/volume/drivers/quobyte.py index f8e85738a..62b9e9fff 100644 --- a/cinder/volume/drivers/quobyte.py +++ b/cinder/volume/drivers/quobyte.py @@ -424,7 +424,7 @@ class QuobyteDriver(remotefs_drv.RemoteFSSnapDriver): msg = _LE("The mount %(mount_path)s is not a valid" " Quobyte USP volume. Error: %(exc)s") \ % {'mount_path': mount_path, 'exc': exc} - raise exception.QuobyteException(msg) + raise exception.VolumeDriverException(msg) if not os.access(mount_path, os.W_OK | os.X_OK): LOG.warn(_LW("Volume is not writable. Please broaden the file" " permissions. Mount: %s"), mount_path) -- 2.45.2