Change in vdsm[master]: storage: move outOfProcess module to vdsm storage lib
aaviram at redhat.com
aaviram at redhat.com
Mon Apr 25 13:49:18 UTC 2016
Amit Aviram has uploaded a new change for review.
Change subject: storage: move outOfProcess module to vdsm storage lib
......................................................................
storage: move outOfProcess module to vdsm storage lib
This patch moves the module storage/outOfProcess.py to
vdsm/storage/outOfProcess.py.
Change-Id: I390f8bc440c377b225a328aeb424233498522a5a
Signed-off-by: Amit Aviram <aaviram at redhat.com>
---
R lib/vdsm/storage/outOfProcess.py
M tests/outOfProcessTests.py
M vdsm/storage/fileSD.py
M vdsm/storage/fileVolume.py
M vdsm/storage/hsm.py
M vdsm/storage/nfsSD.py
M vdsm/storage/sd.py
M vdsm/storage/task.py
8 files changed, 9 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/76/56576/1
diff --git a/vdsm/storage/outOfProcess.py b/lib/vdsm/storage/outOfProcess.py
similarity index 99%
rename from vdsm/storage/outOfProcess.py
rename to lib/vdsm/storage/outOfProcess.py
index ce2057d..a81b9cc 100644
--- a/vdsm/storage/outOfProcess.py
+++ b/lib/vdsm/storage/outOfProcess.py
@@ -26,6 +26,8 @@
from warnings import warn
import weakref
+from __future__ import absolute_import
+
from vdsm import constants
from vdsm.config import config
from vdsm.storage import exception as se
diff --git a/tests/outOfProcessTests.py b/tests/outOfProcessTests.py
index e159364..1c4e493 100644
--- a/tests/outOfProcessTests.py
+++ b/tests/outOfProcessTests.py
@@ -19,7 +19,7 @@
#
from testlib import VdsmTestCase as TestCaseBase
-import storage.outOfProcess as oop
+import vdsm.storage.outOfProcess as oop
from monkeypatch import MonkeyPatchScope
import gc
diff --git a/vdsm/storage/fileSD.py b/vdsm/storage/fileSD.py
index bb843a6..fd5185d 100644
--- a/vdsm/storage/fileSD.py
+++ b/vdsm/storage/fileSD.py
@@ -30,12 +30,12 @@
from vdsm.storage import fileUtils
from vdsm.storage import mount
from vdsm.storage.persistent import PersistentDict, DictValidator
+import vdsm.storage.outOfProcess as oop
import sd
import sdm.volume_artifacts
import fileVolume
import misc
-import outOfProcess as oop
from vdsm import constants
from vdsm.utils import stripNewLines
from vdsm.storage.constants import LEASE_FILEEXT
diff --git a/vdsm/storage/fileVolume.py b/vdsm/storage/fileVolume.py
index db74732..b55b4eb 100644
--- a/vdsm/storage/fileVolume.py
+++ b/vdsm/storage/fileVolume.py
@@ -28,10 +28,10 @@
from vdsm.storage import exception as se
from vdsm.storage.constants import FILE_VOLUME_PERMISSIONS
from vdsm.storage.constants import LEASE_FILEEXT
+import vdsm.storage.outOfProcess as oop
from vdsm.storage.threadLocal import vars
from sdc import sdCache
-import outOfProcess as oop
import volume
import image
import sd
diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index c0968e1..26df9ab 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -49,6 +49,7 @@
from vdsm.storage import mount
from vdsm.storage.constants import STORAGE
from vdsm.storage.constants import SECTOR_SIZE
+import vdsm.storage.outOfProcess as oop
from vdsm.storage.threadLocal import vars
import sp
@@ -63,7 +64,6 @@
import localFsSD
import lvm
import multipath
-import outOfProcess as oop
from sdc import sdCache
import image
import imagetickets
diff --git a/vdsm/storage/nfsSD.py b/vdsm/storage/nfsSD.py
index ece3f50..0594c16 100644
--- a/vdsm/storage/nfsSD.py
+++ b/vdsm/storage/nfsSD.py
@@ -23,10 +23,10 @@
from vdsm.storage import exception as se
from vdsm.storage import fileUtils
from vdsm.storage import mount
+import vdsm.storage.outOfProcess as oop
import sd
import fileSD
-import outOfProcess as oop
import misc
diff --git a/vdsm/storage/sd.py b/vdsm/storage/sd.py
index 3e261bf..33358b9 100644
--- a/vdsm/storage/sd.py
+++ b/vdsm/storage/sd.py
@@ -27,6 +27,7 @@
from contextlib import contextmanager
from vdsm.storage import exception as se
+import vdsm.storage.outOfProcess as oop
from vdsm.storage.persistent import unicodeEncoder, unicodeDecoder
import image
@@ -38,7 +39,6 @@
from vdsm import constants
from vdsm.storage import constants as storage_constants
import clusterlock
-import outOfProcess as oop
import volume
from vdsm.config import config
diff --git a/vdsm/storage/task.py b/vdsm/storage/task.py
index e2b0e2b..c710db9 100644
--- a/vdsm/storage/task.py
+++ b/vdsm/storage/task.py
@@ -53,6 +53,7 @@
from functools import wraps
from vdsm.storage import exception as se
+import vdsm.storage.outOfProcess as oop
from vdsm.storage.threadLocal import vars
import uuid
@@ -62,7 +63,6 @@
from vdsm import concurrent
from vdsm.config import config
from vdsm.logUtils import SimpleLogAdapter
-import outOfProcess as oop
getProcPool = oop.getGlobalProcPool
--
To view, visit https://gerrit.ovirt.org/56576
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I390f8bc440c377b225a328aeb424233498522a5a
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Amit Aviram <aaviram at redhat.com>
More information about the vdsm-patches
mailing list