Change in vdsm[master]: storage: move storage_mailbox to lib

[Code Review]

From Dan Kenigsberg <danken(a)redhat.com&gt;:

Dan Kenigsberg has uploaded a new change for review.

Change subject: storage: move storage_mailbox to lib
......................................................................

storage: move storage_mailbox to lib

Change-Id: I6bf83510617e51d72ce6dcbda63bfe35acff8fa5
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com&gt;
---
M lib/vdsm/storage/Makefile.am
R lib/vdsm/storage/storage_mailbox.py
M tests/storage_mailbox_test.py
M vdsm.spec.in
M vdsm/storage/Makefile.am
M vdsm/storage/blockSD.py
M vdsm/storage/sp.py
7 files changed, 6 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/30/69330/1

diff --git a/lib/vdsm/storage/Makefile.am b/lib/vdsm/storage/Makefile.am
index 4cf1b33..fc76d21 100644
--- a/lib/vdsm/storage/Makefile.am
+++ b/lib/vdsm/storage/Makefile.am
@@ -49,6 +49,7 @@
 	resourceManager.py \
 	rwlock.py \
 	securable.py \
+	storage_mailbox.py \
 	task.py \
 	taskManager.py \
 	threadPool.py \
diff --git a/vdsm/storage/storage_mailbox.py b/lib/vdsm/storage/storage_mailbox.py
similarity index 99%
rename from vdsm/storage/storage_mailbox.py
rename to lib/vdsm/storage/storage_mailbox.py
index 6a227bf..1cfd61a 100644
--- a/vdsm/storage/storage_mailbox.py
+++ b/lib/vdsm/storage/storage_mailbox.py
@@ -18,6 +18,7 @@
 # Refer to the README and COPYING files for full details of the license
 #
 
+from __future__ import absolute_import
 import os
 import errno
 import time
diff --git a/tests/storage_mailbox_test.py b/tests/storage_mailbox_test.py
index 08aa60d..4d9ed82 100644
--- a/tests/storage_mailbox_test.py
+++ b/tests/storage_mailbox_test.py
@@ -29,10 +29,10 @@
 from testlib import VdsmTestCase as TestCaseBase
 from monkeypatch import MonkeyPatchScope
 
+import vdsm.storage.storage_mailbox as sm
 from vdsm.utils import retry
 
 from storage.sd import DOMAIN_META_DATA
-import storage.storage_mailbox as sm
 
 MAX_HOSTS = 10
 MAILER_TIMEOUT = 6
diff --git a/vdsm.spec.in b/vdsm.spec.in
index dfa33f3..975c4b4 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -950,7 +950,6 @@
 %{_datadir}/%{vdsm_name}/storage/sd.py*
 %{_datadir}/%{vdsm_name}/storage/sp.py*
 %{_datadir}/%{vdsm_name}/storage/spbackends.py*
-%{_datadir}/%{vdsm_name}/storage/storage_mailbox.py*
 %{_datadir}/%{vdsm_name}/storage/storageServer.py*
 %{_datadir}/%{vdsm_name}/storage/volume.py*
 %{_datadir}/%{vdsm_name}/storage/imageRepository/__init__.py*
@@ -1209,6 +1208,7 @@
 %{python_sitelib}/%{vdsm_name}/storage/resourceManager.py*
 %{python_sitelib}/%{vdsm_name}/storage/rwlock.py*
 %{python_sitelib}/%{vdsm_name}/storage/securable.py*
+%{python_sitelib}/%{vdsm_name}/storage/storage_mailbox.py*
 %{python_sitelib}/%{vdsm_name}/storage/task.py*
 %{python_sitelib}/%{vdsm_name}/storage/taskManager.py*
 %{python_sitelib}/%{vdsm_name}/storage/threadPool.py*
diff --git a/vdsm/storage/Makefile.am b/vdsm/storage/Makefile.am
index edcd55f..777ff0a 100644
--- a/vdsm/storage/Makefile.am
+++ b/vdsm/storage/Makefile.am
@@ -43,7 +43,6 @@
 	sd.py \
 	sp.py \
 	spbackends.py \
-	storage_mailbox.py \
 	storageServer.py \
 	volume.py
 
diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py
index 4f64be8..d636f15 100644
--- a/vdsm/storage/blockSD.py
+++ b/vdsm/storage/blockSD.py
@@ -53,6 +53,7 @@
 from vdsm.storage import multipath
 from vdsm.storage import resourceManager as rm
 from vdsm.storage.persistent import PersistentDict, DictValidator
+from vdsm.storage.storage_mailbox import MAILBOX_SIZE
 from vdsm.storage.threadlocal import vars
 import vdsm.supervdsm as svdsm
 
@@ -60,7 +61,6 @@
 from sdm import volume_artifacts
 import blockVolume
 import resourceFactories
-from storage_mailbox import MAILBOX_SIZE
 
 STORAGE_DOMAIN_TAG = "RHAT_storage_domain"
 STORAGE_UNREADY_DOMAIN_TAG = STORAGE_DOMAIN_TAG + "_UNREADY"
diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py
index 3972cb7..773c7f1 100644
--- a/vdsm/storage/sp.py
+++ b/vdsm/storage/sp.py
@@ -40,10 +40,10 @@
 from vdsm.storage import misc
 from vdsm.storage import mount
 from vdsm.storage import resourceManager as rm
+from vdsm.storage import storage_mailbox
 from vdsm.storage import xlease
 from vdsm.storage.securable import secured, unsecured
 
-import storage_mailbox
 import blockSD
 import fileSD
 import sd


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6bf83510617e51d72ce6dcbda63bfe35acff8fa5
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;