Change in vdsm[master]: storage: Move storage_exception module to lib

frolland at redhat.com frolland at redhat.com
Tue Mar 8 12:15:31 UTC 2016


Hello Fred Rolland,

I'd like you to do a code review.  Please visit

    https://gerrit.ovirt.org/54467

to review the following change.

Change subject: storage: Move storage_exception module to lib
......................................................................

storage: Move storage_exception module to lib

Moving vdsm/storage/storage_exception.py to
lib/vdsm/storage/storage_exception.py

Change-Id: Ib4995df5a670ca9bd460043d44d2855eb64a78f8
Signed-off-by: Fred Rolland <frolland at redhat.com>
---
M debian/vdsm-python.install
M debian/vdsm.install
M lib/vdsm/storage/Makefile.am
R lib/vdsm/storage/storage_exception.py
M tests/blockVolumeTests.py
M tests/functional/storageTests.py
M tests/main.py
M tests/storagefakelib.py
M tests/storagefakelibTests.py
M vdsm.spec.in
M vdsm/storage/Makefile.am
M vdsm/storage/blockSD.py
M vdsm/storage/blockVolume.py
M vdsm/storage/clusterlock.py
M vdsm/storage/dispatcher.py
M vdsm/storage/fileSD.py
M vdsm/storage/fileVolume.py
M vdsm/storage/glusterSD.py
M vdsm/storage/hsm.py
M vdsm/storage/image.py
M vdsm/storage/imageRepository/formatConverter.py
M vdsm/storage/imageSharing.py
M vdsm/storage/imagetickets.py
M vdsm/storage/localFsSD.py
M vdsm/storage/lvm.py
M vdsm/storage/misc.py
M vdsm/storage/nfsSD.py
M vdsm/storage/outOfProcess.py
M vdsm/storage/persistentDict.py
M vdsm/storage/resourceFactories.py
M vdsm/storage/resourceManager.py
M vdsm/storage/sd.py
M vdsm/storage/sdc.py
M vdsm/storage/sp.py
M vdsm/storage/spbackends.py
M vdsm/storage/storageServer.py
M vdsm/storage/storage_mailbox.py
M vdsm/storage/task.py
M vdsm/storage/taskManager.py
M vdsm/storage/volume.py
40 files changed, 137 insertions(+), 92 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/67/54467/1

diff --git a/debian/vdsm-python.install b/debian/vdsm-python.install
index 517854b..92a4adb 100644
--- a/debian/vdsm-python.install
+++ b/debian/vdsm-python.install
@@ -61,6 +61,7 @@
 ./usr/lib/python2.7/dist-packages/vdsm/storage/__init__.py
 ./usr/lib/python2.7/dist-packages/vdsm/storage/constants.py
 ./usr/lib/python2.7/dist-packages/vdsm/storage/securable.py
+./usr/lib/python2.7/dist-packages/vdsm/storage/securable.py
 ./usr/lib/python2.7/dist-packages/vdsm/supervdsm.py
 ./usr/lib/python2.7/dist-packages/vdsm/taskset.py
 ./usr/lib/python2.7/dist-packages/vdsm/tool/__init__.py
diff --git a/debian/vdsm.install b/debian/vdsm.install
index a709a3d..7cfd992 100644
--- a/debian/vdsm.install
+++ b/debian/vdsm.install
@@ -114,7 +114,6 @@
 ./usr/share/vdsm/storage/sp.py
 ./usr/share/vdsm/storage/spbackends.py
 ./usr/share/vdsm/storage/storageServer.py
-./usr/share/vdsm/storage/storage_exception.py
 ./usr/share/vdsm/storage/storage_mailbox.py
 ./usr/share/vdsm/storage/sync.py
 ./usr/share/vdsm/storage/task.py
diff --git a/lib/vdsm/storage/Makefile.am b/lib/vdsm/storage/Makefile.am
index ce71476..5de8f31 100644
--- a/lib/vdsm/storage/Makefile.am
+++ b/lib/vdsm/storage/Makefile.am
@@ -25,4 +25,5 @@
 	__init__.py \
 	constants.py \
 	securable.py \
+	storage_exception.py \
 	$(NULL)
diff --git a/vdsm/storage/storage_exception.py b/lib/vdsm/storage/storage_exception.py
similarity index 99%
rename from vdsm/storage/storage_exception.py
rename to lib/vdsm/storage/storage_exception.py
index 694214a8..e1daf7d 100644
--- a/vdsm/storage/storage_exception.py
+++ b/lib/vdsm/storage/storage_exception.py
@@ -31,6 +31,8 @@
 #
 #######################################################
 
+from __future__ import absolute_import
+
 from vdsm.exception import GeneralException
 from vdsm.storage.securable import SecureError
 SPM_STATUS_ERROR = (654, "Not SPM")
diff --git a/tests/blockVolumeTests.py b/tests/blockVolumeTests.py
index 0ef3093..83c068a 100644
--- a/tests/blockVolumeTests.py
+++ b/tests/blockVolumeTests.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2015 Red Hat, Inc.
+# Copyright 2016 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,8 +20,9 @@
 
 
 from vdsm.config import config
+from vdsm.storage import storage_exception as se
+
 from storage.blockVolume import BlockVolume
-from storage import storage_exception as se
 from storage import volume
 from testlib import permutations, expandPermutations
 from testlib import VdsmTestCase as TestCaseBase
diff --git a/tests/functional/storageTests.py b/tests/functional/storageTests.py
index 2c43d86..3c35f59 100644
--- a/tests/functional/storageTests.py
+++ b/tests/functional/storageTests.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012 Red Hat, Inc.
+# Copyright 2016 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -38,18 +38,18 @@
 except ImportError:
     pass
 
-import storage.sd
-import storage.storage_exception as se
-import storage.volume
-from storage.misc import execCmd
-from storage.mount import Mount
-
 from vdsm.config import config
 from vdsm.constants import VDSM_USER, VDSM_GROUP
+from vdsm.storage import storage_exception as se
 from vdsm.utils import CommandPath, RollbackContext
 from vdsm.virt import vmstatus
 from vdsm import vdscli
 
+import storage.sd
+import storage.volume
+from storage.misc import execCmd
+from storage.mount import Mount
+
 
 if not config.getboolean('vars', 'xmlrpc_enable'):
     raise SkipTest("XML-RPC Bindings are disabled")
diff --git a/tests/main.py b/tests/main.py
index b57ef2d..111f9d8 100644
--- a/tests/main.py
+++ b/tests/main.py
@@ -22,7 +22,8 @@
 import unittest
 
 from gluster import exception as gluster_exception
-from storage import storage_exception
+
+from vdsm.storage import storage_exception
 from vdsm.exception import GeneralException
 
 from testlib import VdsmTestCase as TestCaseBase
diff --git a/tests/storagefakelib.py b/tests/storagefakelib.py
index 3255809..bb0fa93 100644
--- a/tests/storagefakelib.py
+++ b/tests/storagefakelib.py
@@ -1,4 +1,4 @@
-# Copyright 2015 Red Hat, Inc.
+# Copyright 2016 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -25,8 +25,9 @@
 
 from testlib import recorded
 
+from vdsm.storage import storage_exception as se
+
 from storage import lvm as real_lvm
-from storage import storage_exception as se
 
 
 class FakeLVM(object):
diff --git a/tests/storagefakelibTests.py b/tests/storagefakelibTests.py
index 707ffc6..27cb0dc 100644
--- a/tests/storagefakelibTests.py
+++ b/tests/storagefakelibTests.py
@@ -1,4 +1,4 @@
-# Copyright 2015 Red Hat, Inc.
+# Copyright 2016 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,12 +20,13 @@
 from contextlib import contextmanager
 import os
 
+from vdsm.storage import storage_exception as se
+
 from testlib import VdsmTestCase, namedTemporaryDir
 from testlib import permutations, expandPermutations
 from storagefakelib import FakeLVM, FakeResourceManager
 
 from storage import blockSD, blockVolume
-from storage import storage_exception as se
 from storage import lvm as real_lvm
 
 
diff --git a/vdsm.spec.in b/vdsm.spec.in
index bb1c218..8cc3b1a 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -947,7 +947,6 @@
 %{_datadir}/%{vdsm_name}/storage/sd.py*
 %{_datadir}/%{vdsm_name}/storage/sp.py*
 %{_datadir}/%{vdsm_name}/storage/spbackends.py*
-%{_datadir}/%{vdsm_name}/storage/storage_exception.py*
 %{_datadir}/%{vdsm_name}/storage/storage_mailbox.py*
 %{_datadir}/%{vdsm_name}/storage/storageServer.py*
 %{_datadir}/%{vdsm_name}/storage/sync.py*
@@ -1148,6 +1147,7 @@
 %{python_sitelib}/%{vdsm_name}/profiling/profile.py*
 %{python_sitelib}/%{vdsm_name}/storage/__init__.py*
 %{python_sitelib}/%{vdsm_name}/storage/constants.py*
+%{python_sitelib}/%{vdsm_name}/storage/storage_exception.py*
 %{python_sitelib}/%{vdsm_name}/storage/securable.py*
 %{python_sitelib}/%{vdsm_name}/tc/__init__.py*
 %{python_sitelib}/%{vdsm_name}/tc/_parser.py*
diff --git a/vdsm/storage/Makefile.am b/vdsm/storage/Makefile.am
index 9be6100..22336f4 100644
--- a/vdsm/storage/Makefile.am
+++ b/vdsm/storage/Makefile.am
@@ -60,7 +60,6 @@
 	sd.py \
 	sp.py \
 	spbackends.py \
-	storage_exception.py \
 	storage_mailbox.py \
         storageServer.py \
 	sync.py \
diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py
index e33d5aa..d4b3c95 100644
--- a/vdsm/storage/blockSD.py
+++ b/vdsm/storage/blockSD.py
@@ -32,10 +32,11 @@
 from contextlib import contextmanager
 from operator import itemgetter
 
-from vdsm.config import config
 from vdsm import constants
 from vdsm import exception
 from vdsm import utils
+from vdsm.config import config
+from vdsm.storage import storage_exception as se
 import vdsm.supervdsm as svdsm
 
 import misc
@@ -49,7 +50,6 @@
 from resourceFactories import LVM_ACTIVATION_NAMESPACE
 from persistentDict import PersistentDict, DictValidator
 import iscsi
-import storage_exception as se
 from storage_mailbox import MAILBOX_SIZE
 import resourceManager as rm
 import mount
diff --git a/vdsm/storage/blockVolume.py b/vdsm/storage/blockVolume.py
index f504a1f..f032cc1 100644
--- a/vdsm/storage/blockVolume.py
+++ b/vdsm/storage/blockVolume.py
@@ -26,8 +26,8 @@
 from vdsm import constants
 from vdsm import exception
 from vdsm.config import config
+from vdsm.storage import storage_exception as se
 import vdsm.utils as utils
-import storage_exception as se
 import volume
 import image
 import sd
diff --git a/vdsm/storage/clusterlock.py b/vdsm/storage/clusterlock.py
index f5d9dac..3dff2ed 100644
--- a/vdsm/storage/clusterlock.py
+++ b/vdsm/storage/clusterlock.py
@@ -27,10 +27,10 @@
 import sanlock
 
 import misc
-import storage_exception as se
 from vdsm import constants
-from vdsm.config import config
 from vdsm import utils
+from vdsm.config import config
+from vdsm.storage import storage_exception as se
 
 
 MAX_HOST_ID = 250
diff --git a/vdsm/storage/dispatcher.py b/vdsm/storage/dispatcher.py
index 06bd464..b460201 100644
--- a/vdsm/storage/dispatcher.py
+++ b/vdsm/storage/dispatcher.py
@@ -21,9 +21,9 @@
 import logging
 from functools import wraps
 from vdsm.config import config
+from vdsm.storage import storage_exception as se
 
 import task
-import storage_exception as se
 
 _EXPORTED_ATTRIBUTE = "__dispatcher_exported__"
 
diff --git a/vdsm/storage/fileSD.py b/vdsm/storage/fileSD.py
index 9436f64..b08eedc 100644
--- a/vdsm/storage/fileSD.py
+++ b/vdsm/storage/fileSD.py
@@ -26,18 +26,19 @@
 import fnmatch
 import re
 
+from vdsm import constants
+from vdsm import supervdsm
+from vdsm.storage import storage_exception as se
+from vdsm.storage.constants import LEASE_FILEEXT
+from vdsm.utils import stripNewLines
+
 import sd
-import storage_exception as se
 import fileUtils
 import fileVolume
 import misc
 import outOfProcess as oop
 from remoteFileHandler import Timeout
 from persistentDict import PersistentDict, DictValidator
-from vdsm import constants
-from vdsm.utils import stripNewLines
-from vdsm.storage.constants import LEASE_FILEEXT
-from vdsm import supervdsm
 import mount
 
 REMOTE_PATH = "REMOTE_PATH"
diff --git a/vdsm/storage/fileVolume.py b/vdsm/storage/fileVolume.py
index b0f0422..038da88 100644
--- a/vdsm/storage/fileVolume.py
+++ b/vdsm/storage/fileVolume.py
@@ -22,12 +22,13 @@
 import os
 import sanlock
 
-import storage_exception as se
 from vdsm import exception
 from vdsm import qemuimg
 from vdsm.commands import grepCmd
+from vdsm.storage import storage_exception as se
 from vdsm.storage.constants import FILE_VOLUME_PERMISSIONS
 from vdsm.storage.constants import LEASE_FILEEXT
+
 from sdc import sdCache
 import outOfProcess as oop
 import volume
diff --git a/vdsm/storage/glusterSD.py b/vdsm/storage/glusterSD.py
index 2931083..96c954c 100644
--- a/vdsm/storage/glusterSD.py
+++ b/vdsm/storage/glusterSD.py
@@ -1,10 +1,32 @@
+#
+# Copyright 2013-2016 Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
+#
+
 import os
+
+from vdsm.storage import storage_exception as se
+
 import nfsSD
 import sd
 import glusterVolume
 import fileSD
 import mount
-import storage_exception as se
 
 
 class GlusterStorageDomain(nfsSD.NfsStorageDomain):
diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index 90d2660..f9d76e3 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -43,8 +43,9 @@
 from vdsm import supervdsm
 from vdsm import utils
 from vdsm.config import config
-from vdsm.storage.constants import STORAGE
+from vdsm.storage import storage_exception as se
 from vdsm.storage.constants import SECTOR_SIZE
+from vdsm.storage.constants import STORAGE
 
 import sp
 from spbackends import MAX_POOL_DESCRIPTION_SIZE, MAX_DOMAINS
@@ -69,7 +70,6 @@
 from misc import deprecated
 import taskManager
 import clusterlock
-import storage_exception as se
 from threadLocal import vars
 import resourceManager as rm
 from resourceFactories import IMAGE_NAMESPACE
diff --git a/vdsm/storage/image.py b/vdsm/storage/image.py
index a5c088d..b0dbf22 100644
--- a/vdsm/storage/image.py
+++ b/vdsm/storage/image.py
@@ -24,17 +24,18 @@
 import uuid
 from contextlib import contextmanager
 
-import volume
 from vdsm import qemuimg
 from vdsm import virtsparsify
 from vdsm.config import config
+from vdsm.exception import ActionStopped
+from vdsm.storage import storage_exception as se
+
+import volume
 from sdc import sdCache
 import sd
 import misc
 import fileUtils
 import imageSharing
-from vdsm.exception import ActionStopped
-import storage_exception as se
 import task
 from threadLocal import vars
 import resourceFactories
diff --git a/vdsm/storage/imageRepository/formatConverter.py b/vdsm/storage/imageRepository/formatConverter.py
index 5aaafef..b60721e 100644
--- a/vdsm/storage/imageRepository/formatConverter.py
+++ b/vdsm/storage/imageRepository/formatConverter.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012 Red Hat, Inc.
+# Copyright 2016 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,12 +22,12 @@
 
 from vdsm import constants
 from vdsm import qemuimg
+from vdsm.storage import storage_exception as se
 
 from storage import sd
 from storage import blockSD
 from storage import volume
 from storage import blockVolume
-from storage import storage_exception as se
 
 
 def __convertDomainMetadataToTags(domain, targetVersion):
diff --git a/vdsm/storage/imageSharing.py b/vdsm/storage/imageSharing.py
index 771250e..eb05d4b 100644
--- a/vdsm/storage/imageSharing.py
+++ b/vdsm/storage/imageSharing.py
@@ -1,4 +1,4 @@
-# Copyright 2013 Red Hat, Inc.
+# Copyright 2016 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,10 +20,11 @@
 import logging
 import signal
 
-import curlImgWrap
-from vdsm import constants
 from vdsm import commands
-import storage_exception as se
+from vdsm import constants
+from vdsm.storage import storage_exception as se
+
+import curlImgWrap
 
 
 log = logging.getLogger("Storage.ImageSharing")
diff --git a/vdsm/storage/imagetickets.py b/vdsm/storage/imagetickets.py
index e87a34c..e45c126 100644
--- a/vdsm/storage/imagetickets.py
+++ b/vdsm/storage/imagetickets.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2009-2012 Red Hat, Inc.
+# Copyright 2009-2016 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -27,8 +27,7 @@
 from contextlib import closing
 
 from vdsm import constants
-
-import storage_exception as se
+from vdsm.storage import storage_exception as se
 
 try:
     from ovirt_image_daemon import uhttp
diff --git a/vdsm/storage/localFsSD.py b/vdsm/storage/localFsSD.py
index bbbc1a7..298200f 100644
--- a/vdsm/storage/localFsSD.py
+++ b/vdsm/storage/localFsSD.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2009-2011 Red Hat, Inc.
+# Copyright 2009-2016 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,10 +21,11 @@
 import os
 from glob import glob
 
+from vdsm.storage import storage_exception as se
+
 import sd
 import fileSD
 import fileUtils
-import storage_exception as se
 import misc
 import clusterlock
 
diff --git a/vdsm/storage/lvm.py b/vdsm/storage/lvm.py
index aab4bc6..8660797 100644
--- a/vdsm/storage/lvm.py
+++ b/vdsm/storage/lvm.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2011 Red Hat, Inc.
+# Copyright 2010-2016 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -38,10 +38,11 @@
 from subprocess import list2cmdline
 
 from vdsm import constants
+from vdsm.config import config
+from vdsm.storage import storage_exception as se
+
 import misc
 import multipath
-import storage_exception as se
-from vdsm.config import config
 import devicemapper
 
 log = logging.getLogger("Storage.LVM")
diff --git a/vdsm/storage/misc.py b/vdsm/storage/misc.py
index d67f66d..cb48fa6 100644
--- a/vdsm/storage/misc.py
+++ b/vdsm/storage/misc.py
@@ -51,9 +51,8 @@
 from vdsm import constants
 from vdsm import logUtils
 from vdsm import utils
+from vdsm.storage import storage_exception as se
 from vdsm.storage.constants import SECTOR_SIZE
-
-import storage_exception as se
 
 IOUSER = "vdsm"
 DIRECTFLAG = "direct"
diff --git a/vdsm/storage/nfsSD.py b/vdsm/storage/nfsSD.py
index 1f94439..6135301 100644
--- a/vdsm/storage/nfsSD.py
+++ b/vdsm/storage/nfsSD.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2009-2011 Red Hat, Inc.
+# Copyright 2009-2016 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,10 +20,11 @@
 
 import os
 
+from vdsm.storage import storage_exception as se
+
 import sd
 import fileSD
 import fileUtils
-import storage_exception as se
 import outOfProcess as oop
 import mount
 import misc
diff --git a/vdsm/storage/outOfProcess.py b/vdsm/storage/outOfProcess.py
index 19eb546..50af315 100644
--- a/vdsm/storage/outOfProcess.py
+++ b/vdsm/storage/outOfProcess.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2011-2014 Red Hat, Inc.
+# Copyright 2011-2016 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -29,6 +29,8 @@
 
 from vdsm import constants
 from vdsm.config import config
+from vdsm.storage import storage_exception as se
+
 import threading
 from functools import partial
 
@@ -38,7 +40,6 @@
     pass
 
 from remoteFileHandler import RemoteFileHandlerPool
-import storage_exception as se
 
 RFH = 'rfh'
 IOPROC = 'ioprocess'
diff --git a/vdsm/storage/persistentDict.py b/vdsm/storage/persistentDict.py
index 392cfb8..39d77c6 100644
--- a/vdsm/storage/persistentDict.py
+++ b/vdsm/storage/persistentDict.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2009-2011 Red Hat, Inc.
+# Copyright 2009-2016 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -27,7 +27,8 @@
 import logging
 from contextlib import contextmanager
 
-import storage_exception as se
+from vdsm.storage import storage_exception as se
+
 import threading
 from copy import deepcopy
 from itertools import ifilter
diff --git a/vdsm/storage/resourceFactories.py b/vdsm/storage/resourceFactories.py
index 98c362b..0051be5 100644
--- a/vdsm/storage/resourceFactories.py
+++ b/vdsm/storage/resourceFactories.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2011 Red Hat, Inc.
+# Copyright 2010-2016 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,11 +19,13 @@
 #
 
 import os
+
 from vdsm.config import config
+from vdsm.storage import storage_exception as se
+
 import logging
 import lvm
 import resourceManager as rm
-import storage_exception as se
 from sdc import sdCache
 import sd
 import image
diff --git a/vdsm/storage/resourceManager.py b/vdsm/storage/resourceManager.py
index 7365833..f3f5f0d 100644
--- a/vdsm/storage/resourceManager.py
+++ b/vdsm/storage/resourceManager.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2011 Red Hat, Inc.
+# Copyright 2016 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -27,11 +27,12 @@
 from uuid import uuid4
 from Queue import Queue
 
-import storage_exception as se
-import misc
-from vdsm.logUtils import SimpleLogAdapter
 from vdsm import concurrent
 from vdsm import utils
+from vdsm.logUtils import SimpleLogAdapter
+from vdsm.storage import storage_exception as se
+
+import misc
 
 
 # Errors
diff --git a/vdsm/storage/sd.py b/vdsm/storage/sd.py
index 67199d5..25bdb22 100644
--- a/vdsm/storage/sd.py
+++ b/vdsm/storage/sd.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2009-2011 Red Hat, Inc.
+# Copyright 2009-2016 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,20 +26,21 @@
 import codecs
 from contextlib import contextmanager
 
+from vdsm import concurrent
+from vdsm import constants
+from vdsm.config import config
+from vdsm.storage import storage_exception as se
+
 import image
-import storage_exception as se
 import misc
 import resourceFactories
 from resourceFactories import IMAGE_NAMESPACE, VOLUME_NAMESPACE
 import resourceManager as rm
-from vdsm import concurrent
-from vdsm import constants
 import clusterlock
 import outOfProcess as oop
 from persistentDict import unicodeEncoder, unicodeDecoder
 import volume
 
-from vdsm.config import config
 
 DOMAIN_MNT_POINT = 'mnt'
 DOMAIN_META_DATA = 'dom_md'
diff --git a/vdsm/storage/sdc.py b/vdsm/storage/sdc.py
index e07a3ef..9825ce9 100644
--- a/vdsm/storage/sdc.py
+++ b/vdsm/storage/sdc.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2009-2011 Red Hat, Inc.
+# Copyright 2009-2016 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,12 +24,13 @@
 """
 import logging
 import threading
+
 from vdsm.config import config
+from vdsm.storage import storage_exception as se
 
 import multipath
 import lvm
 import misc
-import storage_exception as se
 
 # Default cache age until forcibly refreshed
 DEFAULT_REFRESH_INTERVAL = 300
diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py
index a56d826..9dc88fa 100644
--- a/vdsm/storage/sp.py
+++ b/vdsm/storage/sp.py
@@ -33,7 +33,9 @@
 
 from vdsm import concurrent
 from vdsm import constants
+from vdsm.config import config
 from vdsm.panic import panic
+from vdsm.storage import storage_exception as se
 from vdsm.storage.constants import STORAGE
 from vdsm.storage.securable import secured, unsecured
 
@@ -43,9 +45,7 @@
 import sd
 import misc
 import fileUtils
-from vdsm.config import config
 from sdc import sdCache
-import storage_exception as se
 from remoteFileHandler import Timeout
 import image
 from resourceFactories import IMAGE_NAMESPACE
diff --git a/vdsm/storage/spbackends.py b/vdsm/storage/spbackends.py
index b82da29..f34e2d6 100644
--- a/vdsm/storage/spbackends.py
+++ b/vdsm/storage/spbackends.py
@@ -21,13 +21,14 @@
 import logging
 import weakref
 
+from vdsm.config import config
+from vdsm.storage import storage_exception as se
 from vdsm.storage.securable import secured
 from vdsm.storage.securable import unsecured
 
 import blockSD
 import misc
 import sd
-import storage_exception as se
 
 from persistentDict import DictValidator
 from persistentDict import unicodeDecoder
@@ -36,7 +37,6 @@
 from sp import SPM_ACQUIRED
 from sp import SPM_FREE
 from sp import SPM_ID_FREE
-from vdsm.config import config
 
 
 MAX_POOL_DESCRIPTION_SIZE = 50
diff --git a/vdsm/storage/storageServer.py b/vdsm/storage/storageServer.py
index 38ed710..84223d3 100644
--- a/vdsm/storage/storageServer.py
+++ b/vdsm/storage/storageServer.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2015 Red Hat, Inc.
+# Copyright 2012-2016 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -30,12 +30,13 @@
 import six
 import sys
 
-from vdsm.compat import pickle
-from vdsm.config import config
 from vdsm import concurrent
 from vdsm import supervdsm
 from vdsm import udevadm
 from vdsm import utils
+from vdsm.compat import pickle
+from vdsm.config import config
+from vdsm.storage import storage_exception as se
 
 import mount
 import fileUtils
@@ -44,7 +45,6 @@
 from sync import asyncmethod, AsyncCallStub
 from mount import MountError
 import gluster.cli
-import storage_exception as se
 
 
 class AliasAlreadyRegisteredError(RuntimeError):
diff --git a/vdsm/storage/storage_mailbox.py b/vdsm/storage/storage_mailbox.py
index b30fbab..b76fa5c 100644
--- a/vdsm/storage/storage_mailbox.py
+++ b/vdsm/storage/storage_mailbox.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2009-2011 Red Hat, Inc.
+# Copyright 2009-2016 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,14 +28,16 @@
 import logging
 
 import uuid
+
+from vdsm import concurrent
+from vdsm import constants
 from vdsm.config import config
+from vdsm.storage.storage_exception import InvalidParameterException
+
 import sd
 import misc
 import task
 from threadPool import ThreadPool
-from storage_exception import InvalidParameterException
-from vdsm import concurrent
-from vdsm import constants
 
 __author__ = "ayalb"
 __date__ = "$Mar 9, 2009 5:25:07 PM$"
diff --git a/vdsm/storage/task.py b/vdsm/storage/task.py
index a4cc97e..6c7eb06 100644
--- a/vdsm/storage/task.py
+++ b/vdsm/storage/task.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2009-2011 Red Hat, Inc.
+# Copyright 2009-2016 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -52,15 +52,16 @@
 from contextlib import contextmanager
 from functools import wraps
 
-import storage_exception as se
+from vdsm import concurrent
+from vdsm.config import config
+from vdsm.logUtils import SimpleLogAdapter
+from vdsm.storage import storage_exception as se
+
 import uuid
 import misc
 import resourceManager
 from threadLocal import vars
 from weakref import proxy
-from vdsm import concurrent
-from vdsm.config import config
-from vdsm.logUtils import SimpleLogAdapter
 import outOfProcess as oop
 
 
diff --git a/vdsm/storage/taskManager.py b/vdsm/storage/taskManager.py
index 3a2bb0f..10663bb 100644
--- a/vdsm/storage/taskManager.py
+++ b/vdsm/storage/taskManager.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2009-2011 Red Hat, Inc.
+# Copyright 2009-2016 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -23,7 +23,8 @@
 import threading
 
 from vdsm.config import config
-import storage_exception as se
+from vdsm.storage import storage_exception as se
+
 from task import Task, Job, TaskCleanType
 from threadPool import ThreadPool
 
diff --git a/vdsm/storage/volume.py b/vdsm/storage/volume.py
index 97752dd..b70c291 100644
--- a/vdsm/storage/volume.py
+++ b/vdsm/storage/volume.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2009-2011 Red Hat, Inc.
+# Copyright 2009-2016 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -23,9 +23,10 @@
 import time
 from contextlib import contextmanager
 
-import image
 from vdsm import qemuimg
-import storage_exception as se
+from vdsm.storage import storage_exception as se
+
+import image
 import sd
 from sdc import sdCache
 import misc


-- 
To view, visit https://gerrit.ovirt.org/54467
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4995df5a670ca9bd460043d44d2855eb64a78f8
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Freddy Rolland <frolland at redhat.com>
Gerrit-Reviewer: Fred Rolland <frolland at redhat.com>


More information about the vdsm-patches mailing list