Ido Barkan has uploaded a new change for review. Change subject: Move udevadm to lib/vdsm ......................................................................
Move udevadm to lib/vdsm udevadm is a handy tool that other parts of vdsm could use beside storage. Change-Id: I113bd85820805e60cbf6a7266ed788ec3ba48637 Signed-off-by: Ido Barkan <[email protected]> --- M debian/vdsm-python.install M debian/vdsm.install M lib/vdsm/Makefile.am R lib/vdsm/udevadm.py M vdsm.spec.in M vdsm/storage/Makefile.am M vdsm/storage/multipath.py M vdsm/storage/storageServer.py 8 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/19/40119/1 diff --git a/debian/vdsm-python.install b/debian/vdsm-python.install index 9cdf711..2e17c76 100644 --- a/debian/vdsm-python.install +++ b/debian/vdsm-python.install @@ -41,6 +41,7 @@ ./usr/lib/python2.7/dist-packages/vdsm/tool/upgrade_300_networks.py ./usr/lib/python2.7/dist-packages/vdsm/tool/validate_ovirt_certs.py ./usr/lib/python2.7/dist-packages/vdsm/tool/vdsm-id.py +./usr/lib/python2.7/dist-packages/vdsm/udevadm.py ./usr/lib/python2.7/dist-packages/vdsm/utils.py ./usr/lib/python2.7/dist-packages/vdsm/vdscli.py ./usr/lib/python2.7/dist-packages/vdsm/virtsparsify.py diff --git a/debian/vdsm.install b/debian/vdsm.install index 919398b..6c9ca32 100644 --- a/debian/vdsm.install +++ b/debian/vdsm.install @@ -138,7 +138,6 @@ ./usr/share/vdsm/storage/taskManager.py ./usr/share/vdsm/storage/threadLocal.py ./usr/share/vdsm/storage/threadPool.py -./usr/share/vdsm/storage/udevadm.py ./usr/share/vdsm/storage/volume.py ./usr/share/vdsm/supervdsm.py ./usr/share/vdsm/supervdsmServer diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am index edc79a5..bbbe900 100644 --- a/lib/vdsm/Makefile.am +++ b/lib/vdsm/Makefile.am @@ -38,6 +38,7 @@ schedule.py \ sslutils.py \ sysctl.py \ + udevadm.py \ utils.py \ vdscli.py \ virtsparsify.py \ diff --git a/vdsm/storage/udevadm.py b/lib/vdsm/udevadm.py similarity index 98% rename from vdsm/storage/udevadm.py rename to lib/vdsm/udevadm.py index 4b4b54a..19d5746 100644 --- a/vdsm/storage/udevadm.py +++ b/lib/vdsm/udevadm.py @@ -19,7 +19,7 @@ # import logging -from vdsm import utils +import utils _UDEVADM = utils.CommandPath("udevadm", "/sbin/udevadm", "/usr/sbin/udevadm") diff --git a/vdsm.spec.in b/vdsm.spec.in index 93c7073..19d575d 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -1207,7 +1207,6 @@ %{_datadir}/%{vdsm_name}/storage/task.py* %{_datadir}/%{vdsm_name}/storage/threadLocal.py* %{_datadir}/%{vdsm_name}/storage/threadPool.py* -%{_datadir}/%{vdsm_name}/storage/udevadm.py* %{_datadir}/%{vdsm_name}/storage/volume.py* %{_datadir}/%{vdsm_name}/storage/imageRepository/__init__.py* %{_datadir}/%{vdsm_name}/storage/imageRepository/formatConverter.py* @@ -1351,6 +1350,7 @@ %{python_sitelib}/%{vdsm_name}/schedule.py* %{python_sitelib}/%{vdsm_name}/sslutils.py* %{python_sitelib}/%{vdsm_name}/sysctl.py* +%{python_sitelib}/%{vdsm_name}/udevadm.py* %{python_sitelib}/%{vdsm_name}/utils.py* %{python_sitelib}/%{vdsm_name}/vdscli.py* %{python_sitelib}/%{vdsm_name}/virtsparsify.py* diff --git a/vdsm/storage/Makefile.am b/vdsm/storage/Makefile.am index a342efb..4ebe0a2 100644 --- a/vdsm/storage/Makefile.am +++ b/vdsm/storage/Makefile.am @@ -69,7 +69,6 @@ task.py \ threadLocal.py \ threadPool.py \ - udevadm.py \ volume.py dist_vdsmexec_SCRIPTS = \ diff --git a/vdsm/storage/multipath.py b/vdsm/storage/multipath.py index a1c42b3..20b8ec6 100644 --- a/vdsm/storage/multipath.py +++ b/vdsm/storage/multipath.py @@ -30,6 +30,7 @@ from collections import namedtuple from vdsm import constants +from vdsm import udevadm from vdsm import utils from vdsm.config import config @@ -38,7 +39,6 @@ import iscsi import supervdsm import devicemapper -import udevadm DEV_ISCSI = "iSCSI" DEV_FCP = "FCP" diff --git a/vdsm/storage/storageServer.py b/vdsm/storage/storageServer.py index 22a90d1..82c8674 100644 --- a/vdsm/storage/storageServer.py +++ b/vdsm/storage/storageServer.py @@ -31,6 +31,7 @@ from vdsm.compat import pickle from vdsm.config import config +from vdsm import udevadm import mount import fileUtils @@ -39,7 +40,6 @@ from sync import asyncmethod, AsyncCallStub from mount import MountError import storage_exception as se -import udevadm class AliasAlreadyRegisteredError(RuntimeError): -- To view, visit https://gerrit.ovirt.org/40119 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I113bd85820805e60cbf6a7266ed788ec3ba48637 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
