From Dan Kenigsberg <dan...@redhat.com>: Dan Kenigsberg has uploaded a new change for review.
Change subject: storage: move resourceManager to lib ...................................................................... storage: move resourceManager to lib Change-Id: I2546cf1b88f57362c94b817e2bc5cfca2db17a73 Signed-off-by: Dan Kenigsberg <dan...@redhat.com> --- M lib/vdsm/storage/Makefile.am R lib/vdsm/storage/resourceManager.py M tests/storage_merge_test.py M tests/storage_resourcemanager_test.py M tests/storage_sdm_copy_data_test.py M tests/storage_sdm_create_volume_test.py M tests/storage_sdm_merge_test.py M tests/storage_volume_test.py M tests/storagefakelib.py M vdsm.spec.in M vdsm/storage/Makefile.am M vdsm/storage/blockSD.py M vdsm/storage/blockVolume.py M vdsm/storage/hsm.py M vdsm/storage/image.py M vdsm/storage/merge.py M vdsm/storage/resourceFactories.py M vdsm/storage/sd.py M vdsm/storage/sdm/api/copy_data.py M vdsm/storage/sdm/api/create_volume.py M vdsm/storage/sdm/api/move_device.py M vdsm/storage/sdm/api/reduce_domain.py M vdsm/storage/sp.py M vdsm/storage/task.py M vdsm/storage/volume.py 25 files changed, 23 insertions(+), 23 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/28/69328/1 diff --git a/lib/vdsm/storage/Makefile.am b/lib/vdsm/storage/Makefile.am index 4780958..b6efac5 100644 --- a/lib/vdsm/storage/Makefile.am +++ b/lib/vdsm/storage/Makefile.am @@ -46,6 +46,7 @@ multipath.py \ outOfProcess.py \ persistent.py \ + resourceManager.py \ rwlock.py \ securable.py \ threadPool.py \ diff --git a/vdsm/storage/resourceManager.py b/lib/vdsm/storage/resourceManager.py similarity index 100% rename from vdsm/storage/resourceManager.py rename to lib/vdsm/storage/resourceManager.py diff --git a/tests/storage_merge_test.py b/tests/storage_merge_test.py index 0015e24..1035ae1 100644 --- a/tests/storage_merge_test.py +++ b/tests/storage_merge_test.py @@ -37,12 +37,12 @@ from vdsm.storage import constants as sc from vdsm.storage import exception as se from vdsm.storage import guarded +from vdsm.storage import resourceManager from storage import blockVolume from storage import fileVolume from storage import merge from storage import image -from storage import resourceManager from storage import sd from storage import volume diff --git a/tests/storage_resourcemanager_test.py b/tests/storage_resourcemanager_test.py index ea29e70..ff6fdee 100644 --- a/tests/storage_resourcemanager_test.py +++ b/tests/storage_resourcemanager_test.py @@ -26,7 +26,7 @@ import types from resource import getrlimit, RLIMIT_NPROC -from storage import resourceManager as rm +from vdsm.storage import resourceManager as rm from monkeypatch import MonkeyPatch from storagefakelib import FakeResourceManager diff --git a/tests/storage_sdm_copy_data_test.py b/tests/storage_sdm_copy_data_test.py index adc46c7..bda1f72 100644 --- a/tests/storage_sdm_copy_data_test.py +++ b/tests/storage_sdm_copy_data_test.py @@ -41,10 +41,10 @@ from vdsm.storage import constants as sc from vdsm.storage import exception as se from vdsm.storage import guarded +from vdsm.storage import resourceManager from vdsm.storage import workarounds from storage import blockVolume, sd, volume -from storage import resourceManager import storage.sdm.api.copy_data diff --git a/tests/storage_sdm_create_volume_test.py b/tests/storage_sdm_create_volume_test.py index 0fb7e4b..e4e1f71 100644 --- a/tests/storage_sdm_create_volume_test.py +++ b/tests/storage_sdm_create_volume_test.py @@ -31,9 +31,9 @@ from vdsm import jobs from vdsm.storage import constants as sc from vdsm.storage import exception as se +from vdsm.storage import resourceManager as rm from storage import fileVolume, sd -from storage import resourceManager as rm import storage.sdm.api.create_volume diff --git a/tests/storage_sdm_merge_test.py b/tests/storage_sdm_merge_test.py index b17e609..52e486f 100644 --- a/tests/storage_sdm_merge_test.py +++ b/tests/storage_sdm_merge_test.py @@ -37,11 +37,11 @@ from vdsm.storage import constants as sc from vdsm.storage import exception as se from vdsm.storage import guarded +from vdsm.storage import resourceManager from storage import image from storage import merge from storage import blockVolume, sd, volume -from storage import resourceManager import storage.sdm.api.merge diff --git a/tests/storage_volume_test.py b/tests/storage_volume_test.py index 3c8f6e0..73a921b 100644 --- a/tests/storage_volume_test.py +++ b/tests/storage_volume_test.py @@ -32,8 +32,8 @@ from vdsm.storage import constants as sc from vdsm.storage import exception as se +from vdsm.storage import resourceManager as rm -from storage import resourceManager as rm from storage import sd from storage import volume diff --git a/tests/storagefakelib.py b/tests/storagefakelib.py index 3ceac84..4ea4f3c 100644 --- a/tests/storagefakelib.py +++ b/tests/storagefakelib.py @@ -27,10 +27,10 @@ from vdsm.storage import exception as se from vdsm.storage import lvm as real_lvm +from vdsm.storage import resourceManager as rm from vdsm.storage.constants import VG_EXTENT_SIZE_MB from vdsm import utils -from storage import resourceManager as rm class FakeLVM(object): # We pretend all PVs are 10G in size diff --git a/vdsm.spec.in b/vdsm.spec.in index 2d501fa..db979ad 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -946,7 +946,6 @@ %{_datadir}/%{vdsm_name}/storage/merge.py* %{_datadir}/%{vdsm_name}/storage/nfsSD.py* %{_datadir}/%{vdsm_name}/storage/resourceFactories.py* -%{_datadir}/%{vdsm_name}/storage/resourceManager.py* %{_datadir}/%{vdsm_name}/storage/sdc.py* %{_datadir}/%{vdsm_name}/storage/sd.py* %{_datadir}/%{vdsm_name}/storage/sp.py* @@ -1209,6 +1208,7 @@ %{python_sitelib}/%{vdsm_name}/storage/multipath.py* %{python_sitelib}/%{vdsm_name}/storage/outOfProcess.py* %{python_sitelib}/%{vdsm_name}/storage/persistent.py* +%{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/threadPool.py* diff --git a/vdsm/storage/Makefile.am b/vdsm/storage/Makefile.am index 3f39035..8ebecbb 100644 --- a/vdsm/storage/Makefile.am +++ b/vdsm/storage/Makefile.am @@ -39,7 +39,6 @@ monitor.py \ nfsSD.py \ resourceFactories.py \ - resourceManager.py \ sdc.py \ sd.py \ sp.py \ diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py index 2dc4fc1..4f64be8 100644 --- a/vdsm/storage/blockSD.py +++ b/vdsm/storage/blockSD.py @@ -51,6 +51,7 @@ from vdsm.storage import misc from vdsm.storage import mount from vdsm.storage import multipath +from vdsm.storage import resourceManager as rm from vdsm.storage.persistent import PersistentDict, DictValidator from vdsm.storage.threadlocal import vars import vdsm.supervdsm as svdsm @@ -60,7 +61,6 @@ import blockVolume import resourceFactories from storage_mailbox import MAILBOX_SIZE -import resourceManager as rm STORAGE_DOMAIN_TAG = "RHAT_storage_domain" STORAGE_UNREADY_DOMAIN_TAG = STORAGE_DOMAIN_TAG + "_UNREADY" diff --git a/vdsm/storage/blockVolume.py b/vdsm/storage/blockVolume.py index 2bada04..edb4c7a 100644 --- a/vdsm/storage/blockVolume.py +++ b/vdsm/storage/blockVolume.py @@ -33,6 +33,7 @@ from vdsm.storage import exception as se from vdsm.storage import lvm from vdsm.storage import misc +from vdsm.storage import resourceManager as rm from vdsm.storage.misc import deprecated from vdsm.storage.threadlocal import vars from vdsm.storage.volumemetadata import VolumeMetadata @@ -43,7 +44,6 @@ import sd import blockSD import task -import resourceManager as rm from sdc import sdCache diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index faa49b1..799985f 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -56,6 +56,7 @@ from vdsm.storage import mount from vdsm.storage import multipath from vdsm.storage import outOfProcess as oop +from vdsm.storage import resourceManager as rm from vdsm.storage import types from vdsm.storage.constants import STORAGE from vdsm.storage.constants import SECTOR_SIZE @@ -76,7 +77,6 @@ import image import merge import taskManager -import resourceManager as rm import dispatcher import storageServer diff --git a/vdsm/storage/image.py b/vdsm/storage/image.py index 5a026d2..2720c04 100644 --- a/vdsm/storage/image.py +++ b/vdsm/storage/image.py @@ -33,6 +33,7 @@ from vdsm.storage import fileUtils from vdsm.storage import imageSharing from vdsm.storage import misc +from vdsm.storage import resourceManager as rm from vdsm.storage import workarounds from vdsm.storage.threadlocal import vars @@ -40,7 +41,6 @@ import sd from vdsm.common.exception import ActionStopped import task -import resourceManager as rm log = logging.getLogger('storage.Image') diff --git a/vdsm/storage/merge.py b/vdsm/storage/merge.py index 5f62a67..3ce2b37 100644 --- a/vdsm/storage/merge.py +++ b/vdsm/storage/merge.py @@ -45,9 +45,9 @@ from vdsm.storage import constants as sc from vdsm.storage import exception as se from vdsm.storage import guarded +from vdsm.storage import resourceManager as rm from storage import image -from storage import resourceManager as rm from storage import sd from storage import volume from storage.sdc import sdCache diff --git a/vdsm/storage/resourceFactories.py b/vdsm/storage/resourceFactories.py index 2bb3c02..9738ea2 100644 --- a/vdsm/storage/resourceFactories.py +++ b/vdsm/storage/resourceFactories.py @@ -24,9 +24,9 @@ from vdsm.storage import constants as sc from vdsm.storage import exception as se from vdsm.storage import lvm +from vdsm.storage import resourceManager as rm import logging -import resourceManager as rm from sdc import sdCache import sd import image diff --git a/vdsm/storage/sd.py b/vdsm/storage/sd.py index d1a0528..7952602 100644 --- a/vdsm/storage/sd.py +++ b/vdsm/storage/sd.py @@ -32,13 +32,13 @@ from vdsm.storage import exception as se from vdsm.storage import misc from vdsm.storage import outOfProcess as oop +from vdsm.storage import resourceManager as rm from vdsm.storage import rwlock from vdsm.storage import xlease from vdsm.storage.persistent import unicodeEncoder, unicodeDecoder import image import resourceFactories -import resourceManager as rm from vdsm import constants from vdsm import qemuimg from vdsm import utils diff --git a/vdsm/storage/sdm/api/copy_data.py b/vdsm/storage/sdm/api/copy_data.py index 288521c..633a799 100644 --- a/vdsm/storage/sdm/api/copy_data.py +++ b/vdsm/storage/sdm/api/copy_data.py @@ -28,9 +28,9 @@ from vdsm import utils from vdsm.storage import constants as sc from vdsm.storage import guarded +from vdsm.storage import resourceManager as rm from vdsm.storage import workarounds -from storage import resourceManager as rm from storage import sd from storage import volume from storage.sdc import sdCache diff --git a/vdsm/storage/sdm/api/create_volume.py b/vdsm/storage/sdm/api/create_volume.py index ea8d7de..7d4d38f 100644 --- a/vdsm/storage/sdm/api/create_volume.py +++ b/vdsm/storage/sdm/api/create_volume.py @@ -23,8 +23,8 @@ from vdsm.common import exception from vdsm.storage import constants as sc from vdsm.storage import exception as se +from vdsm.storage import resourceManager as rm -from storage import resourceManager as rm from storage import image, sd from . import base diff --git a/vdsm/storage/sdm/api/move_device.py b/vdsm/storage/sdm/api/move_device.py index 774ead6..8278a5c 100644 --- a/vdsm/storage/sdm/api/move_device.py +++ b/vdsm/storage/sdm/api/move_device.py @@ -22,11 +22,11 @@ import six -from storage import resourceManager as rm from storage.sdc import sdCache from vdsm import properties from vdsm.storage import exception as se from vdsm.storage.constants import STORAGE +from vdsm.storage import resourceManager as rm from . import base diff --git a/vdsm/storage/sdm/api/reduce_domain.py b/vdsm/storage/sdm/api/reduce_domain.py index 78d2c20..41e0787 100644 --- a/vdsm/storage/sdm/api/reduce_domain.py +++ b/vdsm/storage/sdm/api/reduce_domain.py @@ -20,11 +20,11 @@ from __future__ import absolute_import -from storage import resourceManager as rm from storage.sdc import sdCache from vdsm import properties from vdsm.storage import exception as se from vdsm.storage.constants import STORAGE +from vdsm.storage import resourceManager as rm from . import base diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index fe065af..3972cb7 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -39,6 +39,7 @@ from vdsm.storage import fileUtils from vdsm.storage import misc from vdsm.storage import mount +from vdsm.storage import resourceManager as rm from vdsm.storage import xlease from vdsm.storage.securable import secured, unsecured @@ -50,7 +51,6 @@ from sdc import sdCache import image import merge -import resourceManager as rm POOL_MASTER_DOMAIN = 'mastersd' diff --git a/vdsm/storage/task.py b/vdsm/storage/task.py index b60e668..20fa809 100644 --- a/vdsm/storage/task.py +++ b/vdsm/storage/task.py @@ -55,9 +55,9 @@ from vdsm.storage import exception as se from vdsm.storage.threadlocal import vars from vdsm.storage import outOfProcess as oop +from vdsm.storage import resourceManager import uuid -import resourceManager from weakref import proxy from vdsm import concurrent from vdsm.config import config diff --git a/vdsm/storage/volume.py b/vdsm/storage/volume.py index b43989c..53020f1 100644 --- a/vdsm/storage/volume.py +++ b/vdsm/storage/volume.py @@ -31,6 +31,7 @@ from vdsm.storage import fileUtils from vdsm.storage import guarded from vdsm.storage import misc +from vdsm.storage import resourceManager as rm from vdsm.storage.misc import deprecated from vdsm.storage.threadlocal import vars from vdsm.storage.volumemetadata import VolumeMetadata @@ -38,7 +39,6 @@ import sd from sdc import sdCache import task -import resourceManager as rm DOMAIN_MNT_POINT = 'mnt' -- To view, visit https://gerrit.ovirt.org/69328 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2546cf1b88f57362c94b817e2bc5cfca2db17a73 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <dan...@redhat.com> _______________________________________________ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org