Maor Lipchuk has uploaded a new change for review. Change subject: storage: Move mount module to vdsm storage lib ......................................................................
storage: Move mount module to vdsm storage lib Move storage.mount to vdsm.storage.mount Change-Id: I8ee9fab87abcabc469c15256ba12386112a100e0 Signed-off-by: Maor Lipchuk <[email protected]> --- M debian/vdsm-python.install M debian/vdsm.install M lib/vdsm/storage/Makefile.am R lib/vdsm/storage/mount.py M vdsm.spec.in M vdsm/storage/Makefile.am M vdsm/storage/blockSD.py M vdsm/storage/fileSD.py M vdsm/storage/glusterSD.py M vdsm/storage/hsm.py M vdsm/storage/nfsSD.py M vdsm/storage/sp.py M vdsm/storage/storageServer.py 13 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/92/55292/1 diff --git a/debian/vdsm-python.install b/debian/vdsm-python.install index 92e9d3e..c8fbd0b 100644 --- a/debian/vdsm-python.install +++ b/debian/vdsm-python.install @@ -67,6 +67,7 @@ ./usr/lib/python2.7/dist-packages/vdsm/storage/persistent.py ./usr/lib/python2.7/dist-packages/vdsm/storage/securable.py ./usr/lib/python2.7/dist-packages/vdsm/storage/sync.py +./usr/lib/python2.7/dist-packages/vdsm/storage/mount.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 9671eed..aeefa77 100644 --- a/debian/vdsm.install +++ b/debian/vdsm.install @@ -100,7 +100,6 @@ ./usr/share/vdsm/storage/lvm.env ./usr/share/vdsm/storage/lvm.py ./usr/share/vdsm/storage/misc.py -./usr/share/vdsm/storage/mount.py ./usr/share/vdsm/storage/multipath.py ./usr/share/vdsm/storage/nfsSD.py ./usr/share/vdsm/storage/outOfProcess.py diff --git a/lib/vdsm/storage/Makefile.am b/lib/vdsm/storage/Makefile.am index b98e713..b205b48 100644 --- a/lib/vdsm/storage/Makefile.am +++ b/lib/vdsm/storage/Makefile.am @@ -27,5 +27,6 @@ exception.py \ persistent.py \ securable.py \ + mount.py \ sync.py \ $(NULL) diff --git a/vdsm/storage/mount.py b/lib/vdsm/storage/mount.py similarity index 100% rename from vdsm/storage/mount.py rename to lib/vdsm/storage/mount.py diff --git a/vdsm.spec.in b/vdsm.spec.in index 8d1ba6f..a4cde60 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -933,7 +933,6 @@ %{_datadir}/%{vdsm_name}/storage/lvm.env %{_datadir}/%{vdsm_name}/storage/lvm.py* %{_datadir}/%{vdsm_name}/storage/misc.py* -%{_datadir}/%{vdsm_name}/storage/mount.py* %{_datadir}/%{vdsm_name}/storage/multipath.py* %{_datadir}/%{vdsm_name}/storage/nfsSD.py* %{_datadir}/%{vdsm_name}/storage/outOfProcess.py* @@ -1156,6 +1155,7 @@ %{python_sitelib}/%{vdsm_name}/storage/persistent.py* %{python_sitelib}/%{vdsm_name}/storage/securable.py* %{python_sitelib}/%{vdsm_name}/storage/sync.py* +%{python_sitelib}/%{vdsm_name}/storage/mount.py* %{python_sitelib}/%{vdsm_name}/tc/__init__.py* %{python_sitelib}/%{vdsm_name}/tc/_parser.py* %{python_sitelib}/%{vdsm_name}/tc/_wrapper.py* diff --git a/vdsm/storage/Makefile.am b/vdsm/storage/Makefile.am index 20011b8..2204cc2 100644 --- a/vdsm/storage/Makefile.am +++ b/vdsm/storage/Makefile.am @@ -48,7 +48,6 @@ lvm.py \ misc.py \ monitor.py \ - mount.py \ multipath.py \ nfsSD.py \ outOfProcess.py \ diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py index 42d6c58..57dc274 100644 --- a/vdsm/storage/blockSD.py +++ b/vdsm/storage/blockSD.py @@ -52,7 +52,7 @@ import iscsi from storage_mailbox import MAILBOX_SIZE import resourceManager as rm -import mount +import vdsm.storage.mount import volume STORAGE_DOMAIN_TAG = "RHAT_storage_domain" diff --git a/vdsm/storage/fileSD.py b/vdsm/storage/fileSD.py index 65fd100..be0f976 100644 --- a/vdsm/storage/fileSD.py +++ b/vdsm/storage/fileSD.py @@ -39,7 +39,7 @@ from vdsm.utils import stripNewLines from vdsm.storage.constants import LEASE_FILEEXT from vdsm import supervdsm -import mount +import vdsm.storage.mount REMOTE_PATH = "REMOTE_PATH" diff --git a/vdsm/storage/glusterSD.py b/vdsm/storage/glusterSD.py index b8d643f..e80c5ec 100644 --- a/vdsm/storage/glusterSD.py +++ b/vdsm/storage/glusterSD.py @@ -26,7 +26,7 @@ import sd import glusterVolume import fileSD -import mount +import vdsm.storage.mount class GlusterStorageDomain(nfsSD.NfsStorageDomain): diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index c4305bd..da3e654 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -74,7 +74,7 @@ import resourceManager as rm from resourceFactories import IMAGE_NAMESPACE import devicemapper -import mount +import vdsm.storage.mount import dispatcher import storageServer diff --git a/vdsm/storage/nfsSD.py b/vdsm/storage/nfsSD.py index afede1e..4667d5c 100644 --- a/vdsm/storage/nfsSD.py +++ b/vdsm/storage/nfsSD.py @@ -26,7 +26,7 @@ import fileSD import fileUtils import outOfProcess as oop -import mount +import vdsm.storage.mount import misc diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index 063b80b..fae470b 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -51,7 +51,7 @@ from resourceFactories import IMAGE_NAMESPACE import resourceManager as rm import volume -import mount +import vdsm.storage.mount POOL_MASTER_DOMAIN = 'mastersd' diff --git a/vdsm/storage/storageServer.py b/vdsm/storage/storageServer.py index cf49fc3..fa69a2a 100644 --- a/vdsm/storage/storageServer.py +++ b/vdsm/storage/storageServer.py @@ -39,7 +39,7 @@ from vdsm.storage import exception as se from vdsm.storage import sync -import mount +import vdsm.storage.mount import fileUtils import fileSD import iscsi -- To view, visit https://gerrit.ovirt.org/55292 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8ee9fab87abcabc469c15256ba12386112a100e0 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Maor Lipchuk <[email protected]> Gerrit-Reviewer: Dan Kenigsberg <[email protected]> Gerrit-Reviewer: Maor Lipchuk <[email protected]> Gerrit-Reviewer: Nir Soffer <[email protected]> Gerrit-Reviewer: gerrit-hooks <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
