diff --git a/cinder/exception.py b/cinder/exception.py index a0e4e48348d..c450430aec4 100644 --- a/cinder/exception.py +++ b/cinder/exception.py @@ -1173,13 +1173,6 @@ class ZadaraVolumeNotFound(VolumeDriverException): message = "%(reason)s" -# ZFSSA NFS driver exception. -class WebDAVClientError(VolumeDriverException): - message = _("The WebDAV request failed. Reason: %(msg)s, " - "Return code/reason: %(code)s, Source Volume: %(src)s, " - "Destination Volume: %(dst)s, Method: %(method)s.") - - # StorPool driver class StorPoolConfigurationInvalid(CinderException): message = _("Invalid parameter %(param)s in the %(section)s section " diff --git a/cinder/volume/drivers/zfssa/webdavclient.py b/cinder/volume/drivers/zfssa/webdavclient.py index 9b04960f3ba..8afb8ebdb84 100644 --- a/cinder/volume/drivers/zfssa/webdavclient.py +++ b/cinder/volume/drivers/zfssa/webdavclient.py @@ -59,6 +59,12 @@ propertyupdate_data = """ """ +class WebDAVClientError(exception.VolumeDriverException): + message = _("The WebDAV request failed. Reason: %(msg)s, " + "Return code/reason: %(code)s, Source Volume: %(src)s, " + "Destination Volume: %(dst)s, Method: %(method)s.") + + class ZFSSAWebDAVClient(object): def __init__(self, url, auth_str, **kwargs): """Initialize WebDAV Client""" @@ -129,17 +135,16 @@ class ZFSSAWebDAVClient(object): continue msg = self._lookup_error(err.code) - raise exception.WebDAVClientError(msg=msg, code=err.code, - src=src_file, dst=dst_file, - method=method) + raise WebDAVClientError(msg=msg, code=err.code, + src=src_file, dst=dst_file, + method=method) except http_client.BadStatusLine as err: msg = self._lookup_error('BadStatusLine') code = 'http_client.BadStatusLine' - raise exception.WebDAVClientError(msg=msg, - code=code, - src=src_file, dst=dst_file, - method=method) + raise WebDAVClientError(msg=msg, code=code, + src=src_file, dst=dst_file, + method=method) except urllib.error.URLError as err: reason = '' @@ -147,9 +152,9 @@ class ZFSSAWebDAVClient(object): reason = err.reason msg = self._lookup_error('Bad_Gateway') - raise exception.WebDAVClientError(msg=msg, - code=reason, src=src_file, - dst=dst_file, method=method) + raise WebDAVClientError(msg=msg, code=reason, + src=src_file, + dst=dst_file, method=method) break return response