From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: storage: move lvm.py to lib
......................................................................
storage: move lvm.py to lib
Change-Id: I9d682bc48be3f73b8275ef89ff9abc19160e813a
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M lib/vdsm/storage/Makefile.am
R lib/vdsm/storage/lvm.py
M tests/storage_blocksd_test.py
M tests/storage_fakelib_test.py
M tests/storage_lvm_test.py
M tests/storagefakelib.py
M vdsm.spec.in
M vdsm/storage/Makefile.am
M vdsm/storage/blockSD.py
M vdsm/storage/blockVolume.py
M vdsm/storage/hsm.py
M vdsm/storage/resourceFactories.py
M vdsm/storage/resourceManager.py
M vdsm/storage/sdc.py
M vdsm/storage/sdm/volume_artifacts.py
15 files changed, 16 insertions(+), 13 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/27/69327/1
diff --git a/lib/vdsm/storage/Makefile.am b/lib/vdsm/storage/Makefile.am
index 43dca3a..4780958 100644
--- a/lib/vdsm/storage/Makefile.am
+++ b/lib/vdsm/storage/Makefile.am
@@ -40,6 +40,7 @@
imagetickets.py \
iscsi.py \
iscsiadm.py \
+ merge.py \
misc.py \
mount.py \
multipath.py \
diff --git a/vdsm/storage/lvm.py b/lib/vdsm/storage/lvm.py
similarity index 99%
rename from vdsm/storage/lvm.py
rename to lib/vdsm/storage/lvm.py
index dc4a39d..48cea44 100644
--- a/vdsm/storage/lvm.py
+++ b/lib/vdsm/storage/lvm.py
@@ -24,6 +24,8 @@
Incapsulates the actual LVM mechanics.
"""
+from __future__ import absolute_import
+
import errno
import os
diff --git a/tests/storage_blocksd_test.py b/tests/storage_blocksd_test.py
index a8bf4d0..f0b0e29 100644
--- a/tests/storage_blocksd_test.py
+++ b/tests/storage_blocksd_test.py
@@ -26,7 +26,7 @@
from testlib import VdsmTestCase as TestCaseBase
from storage import blockSD
-from storage import lvm
+from vdsm.storage import lvm
from vdsm import constants
# Make it easy to test the values we care about
diff --git a/tests/storage_fakelib_test.py b/tests/storage_fakelib_test.py
index 3fb2952..cb5868f 100644
--- a/tests/storage_fakelib_test.py
+++ b/tests/storage_fakelib_test.py
@@ -23,6 +23,7 @@
from vdsm import utils
from vdsm.storage import exception as se
from vdsm.storage import constants as sc
+from vdsm.storage import lvm as real_lvm
from testlib import VdsmTestCase, namedTemporaryDir
from testlib import permutations, expandPermutations
@@ -33,7 +34,6 @@
from storagetestlib import FakeSD
from storage import blockSD
-from storage import lvm as real_lvm
MB = 1024 ** 2
diff --git a/tests/storage_lvm_test.py b/tests/storage_lvm_test.py
index 6792266..fba075f 100644
--- a/tests/storage_lvm_test.py
+++ b/tests/storage_lvm_test.py
@@ -21,7 +21,7 @@
from testlib import VdsmTestCase as TestCaseBase
-import storage.lvm as lvm
+import vdsm.storage.lvm as lvm
class LvmTests(TestCaseBase):
diff --git a/tests/storagefakelib.py b/tests/storagefakelib.py
index d337a6a..3ceac84 100644
--- a/tests/storagefakelib.py
+++ b/tests/storagefakelib.py
@@ -26,12 +26,11 @@
from testlib import make_file, recorded
from vdsm.storage import exception as se
+from vdsm.storage import lvm as real_lvm
from vdsm.storage.constants import VG_EXTENT_SIZE_MB
from vdsm import utils
-from storage import lvm as real_lvm
from storage import resourceManager as rm
-
class FakeLVM(object):
# We pretend all PVs are 10G in size
diff --git a/vdsm.spec.in b/vdsm.spec.in
index eef5a4f..2d501fa 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -943,7 +943,6 @@
%{_datadir}/%{vdsm_name}/storage/image.py*
%{_datadir}/%{vdsm_name}/storage/localFsSD.py*
%{_datadir}/%{vdsm_name}/storage/lvm.env
-%{_datadir}/%{vdsm_name}/storage/lvm.py*
%{_datadir}/%{vdsm_name}/storage/merge.py*
%{_datadir}/%{vdsm_name}/storage/nfsSD.py*
%{_datadir}/%{vdsm_name}/storage/resourceFactories.py*
@@ -1204,6 +1203,7 @@
%{python_sitelib}/%{vdsm_name}/storage/imagetickets.py*
%{python_sitelib}/%{vdsm_name}/storage/iscsi.py*
%{python_sitelib}/%{vdsm_name}/storage/iscsiadm.py*
+%{python_sitelib}/%{vdsm_name}/storage/merge.py*
%{python_sitelib}/%{vdsm_name}/storage/misc.py*
%{python_sitelib}/%{vdsm_name}/storage/mount.py*
%{python_sitelib}/%{vdsm_name}/storage/multipath.py*
diff --git a/vdsm/storage/Makefile.am b/vdsm/storage/Makefile.am
index a71a33b..3f39035 100644
--- a/vdsm/storage/Makefile.am
+++ b/vdsm/storage/Makefile.am
@@ -35,7 +35,6 @@
hsm.py \
image.py \
localFsSD.py \
- lvm.py \
merge.py \
monitor.py \
nfsSD.py \
diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py
index 21a83f0..2dc4fc1 100644
--- a/vdsm/storage/blockSD.py
+++ b/vdsm/storage/blockSD.py
@@ -47,6 +47,7 @@
from vdsm.storage import exception as se
from vdsm.storage import fileUtils
from vdsm.storage import iscsi
+from vdsm.storage import lvm
from vdsm.storage import misc
from vdsm.storage import mount
from vdsm.storage import multipath
@@ -56,7 +57,6 @@
import sd
from sdm import volume_artifacts
-import lvm
import blockVolume
import resourceFactories
from storage_mailbox import MAILBOX_SIZE
diff --git a/vdsm/storage/blockVolume.py b/vdsm/storage/blockVolume.py
index 2098dda..2bada04 100644
--- a/vdsm/storage/blockVolume.py
+++ b/vdsm/storage/blockVolume.py
@@ -31,6 +31,7 @@
from vdsm.storage import constants as sc
from vdsm.storage import directio
from vdsm.storage import exception as se
+from vdsm.storage import lvm
from vdsm.storage import misc
from vdsm.storage.misc import deprecated
from vdsm.storage.threadlocal import vars
@@ -42,7 +43,6 @@
import sd
import blockSD
import task
-import lvm
import resourceManager as rm
from sdc import sdCache
diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index 695af5e..faa49b1 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -51,6 +51,7 @@
from vdsm.storage import fileUtils
from vdsm.storage import imagetickets
from vdsm.storage import iscsi
+from vdsm.storage import lvm
from vdsm.storage import misc
from vdsm.storage import mount
from vdsm.storage import multipath
@@ -71,7 +72,6 @@
import nfsSD
import glusterSD
import localFsSD
-import lvm
from sdc import sdCache
import image
import merge
diff --git a/vdsm/storage/resourceFactories.py b/vdsm/storage/resourceFactories.py
index 4126db8..2bb3c02 100644
--- a/vdsm/storage/resourceFactories.py
+++ b/vdsm/storage/resourceFactories.py
@@ -23,9 +23,9 @@
from vdsm.config import config
from vdsm.storage import constants as sc
from vdsm.storage import exception as se
+from vdsm.storage import lvm
import logging
-import lvm
import resourceManager as rm
from sdc import sdCache
import sd
diff --git a/vdsm/storage/resourceManager.py b/vdsm/storage/resourceManager.py
index 0576c09..140fde5 100644
--- a/vdsm/storage/resourceManager.py
+++ b/vdsm/storage/resourceManager.py
@@ -17,6 +17,7 @@
#
# Refer to the README and COPYING files for full details of the license
#
+from __future__ import absolute_import
import threading
import logging
diff --git a/vdsm/storage/sdc.py b/vdsm/storage/sdc.py
index 7fa13ea..7583d1d 100644
--- a/vdsm/storage/sdc.py
+++ b/vdsm/storage/sdc.py
@@ -27,10 +27,10 @@
from vdsm.config import config
from vdsm.storage import exception as se
+from vdsm.storage import lvm
from vdsm.storage import misc
from vdsm.storage import multipath
-import lvm
# Default cache age until forcibly refreshed
DEFAULT_REFRESH_INTERVAL = 300
diff --git a/vdsm/storage/sdm/volume_artifacts.py b/vdsm/storage/sdm/volume_artifacts.py
index 1c1ebde..6d2f041 100644
--- a/vdsm/storage/sdm/volume_artifacts.py
+++ b/vdsm/storage/sdm/volume_artifacts.py
@@ -55,9 +55,10 @@
from vdsm import qemuimg
from vdsm.storage import constants as sc
from vdsm.storage import exception as se
+from vdsm.storage import lvm
from vdsm.storage.volumemetadata import VolumeMetadata
-from storage import image, lvm
+from storage import image
class VolumeArtifacts(object):
--
To view, visit
https://gerrit.ovirt.org/69327
To unsubscribe, visit
https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9d682bc48be3f73b8275ef89ff9abc19160e813a
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>