Idan Shaby has uploaded a new change for review. Change subject: storage: move fuser module to vdsm storage lib ......................................................................
storage: move fuser module to vdsm storage lib This patch moves the module vdsm/storage/fuser.py to lib/vdsm/storage/fuser.py. Change-Id: I752fed7ebe4af8a3837f817634ff4732637c8ac5 Signed-off-by: Idan Shaby <[email protected]> --- M lib/vdsm/storage/Makefile.am R lib/vdsm/storage/fuser.py M tests/fuserTests.py M vdsm.spec.in M vdsm/storage/Makefile.am M vdsm/supervdsmServer 6 files changed, 8 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/20/56620/1 diff --git a/lib/vdsm/storage/Makefile.am b/lib/vdsm/storage/Makefile.am index bd90ef7..70fc0bf 100644 --- a/lib/vdsm/storage/Makefile.am +++ b/lib/vdsm/storage/Makefile.am @@ -26,6 +26,7 @@ constants.py \ exception.py \ fileUtils.py \ + fuser.py \ misc.py \ mount.py \ persistent.py \ diff --git a/vdsm/storage/fuser.py b/lib/vdsm/storage/fuser.py similarity index 93% rename from vdsm/storage/fuser.py rename to lib/vdsm/storage/fuser.py index 3d92efd..ec4aa48 100644 --- a/vdsm/storage/fuser.py +++ b/lib/vdsm/storage/fuser.py @@ -1,5 +1,5 @@ # -# Copyright 2011 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 @@ -17,6 +17,9 @@ # # Refer to the README and COPYING files for full details of the license # + +from __future__ import absolute_import + from vdsm import constants from vdsm.storage import misc diff --git a/tests/fuserTests.py b/tests/fuserTests.py index 9ba0295..b486d9d 100644 --- a/tests/fuserTests.py +++ b/tests/fuserTests.py @@ -20,7 +20,7 @@ import os from tempfile import NamedTemporaryFile -from storage import fuser +from vdsm.storage import fuser from testlib import VdsmTestCase diff --git a/vdsm.spec.in b/vdsm.spec.in index b168ab5..379f84f 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -933,7 +933,6 @@ %{_datadir}/%{vdsm_name}/storage/monitor.py* %{_datadir}/%{vdsm_name}/storage/fileSD.py* %{_datadir}/%{vdsm_name}/storage/fileVolume.py* -%{_datadir}/%{vdsm_name}/storage/fuser.py* %{_datadir}/%{vdsm_name}/storage/imagetickets.py* %{_datadir}/%{vdsm_name}/storage/glusterSD.py* %{_datadir}/%{vdsm_name}/storage/glusterVolume.py* @@ -1176,6 +1175,7 @@ %{python_sitelib}/%{vdsm_name}/storage/constants.py* %{python_sitelib}/%{vdsm_name}/storage/exception.py* %{python_sitelib}/%{vdsm_name}/storage/fileUtils.py* +%{python_sitelib}/%{vdsm_name}/storage/fuser.py* %{python_sitelib}/%{vdsm_name}/storage/misc.py* %{python_sitelib}/%{vdsm_name}/storage/mount.py* %{python_sitelib}/%{vdsm_name}/storage/persistent.py* diff --git a/vdsm/storage/Makefile.am b/vdsm/storage/Makefile.am index 1a0eae0..d7c28a3 100644 --- a/vdsm/storage/Makefile.am +++ b/vdsm/storage/Makefile.am @@ -33,7 +33,6 @@ dispatcher.py \ fileSD.py \ fileVolume.py \ - fuser.py \ imagetickets.py \ glusterSD.py \ glusterVolume.py \ diff --git a/vdsm/supervdsmServer b/vdsm/supervdsmServer index befe627..fe0b6ac 100755 --- a/vdsm/supervdsmServer +++ b/vdsm/supervdsmServer @@ -46,7 +46,6 @@ log = logging.getLogger("SuperVdsm.Server") log.warn("Could not init proper logging", exc_info=True) -from storage import fuser from multiprocessing import Pipe, Process try: from gluster import listPublicFunctions @@ -56,6 +55,7 @@ from vdsm import utils from vdsm import sysctl +from vdsm.storage import fuser from vdsm.storage import mount from vdsm.storage.fileUtils import chown, resolveGid, resolveUid from vdsm.storage.fileUtils import validateAccess as _validateAccess -- To view, visit https://gerrit.ovirt.org/56620 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I752fed7ebe4af8a3837f817634ff4732637c8ac5 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Idan Shaby <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
