Nir Soffer has uploaded a new change for review.
Change subject: storage.monitor: Use lowercase module name
......................................................................
storage.monitor: Use lowercase module name
storage.domainMonitor was using pep8 incompatible and too specific
module name.
Change-Id: Iae1686411a7cfa72580cb6e97bbf54362335dab3
Signed-off-by: Nir Soffer <nsof...@redhat.com>
---
M debian/vdsm.install
M tests/Makefile.am
R tests/storageMonitorTests.py
M vdsm.spec.in
M vdsm/storage/Makefile.am
M vdsm/storage/hsm.py
R vdsm/storage/monitor.py
7 files changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/06/32506/1
diff --git a/debian/vdsm.install b/debian/vdsm.install
index b1840ec..78d75de 100644
--- a/debian/vdsm.install
+++ b/debian/vdsm.install
@@ -94,7 +94,7 @@
./usr/share/vdsm/storage/curlImgWrap.py
./usr/share/vdsm/storage/devicemapper.py
./usr/share/vdsm/storage/dispatcher.py
-./usr/share/vdsm/storage/domainMonitor.py
+./usr/share/vdsm/storage/monitor.py
./usr/share/vdsm/storage/fileSD.py
./usr/share/vdsm/storage/fileUtils.py
./usr/share/vdsm/storage/fileVolume.py
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3a0bbd5..e78846c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -30,7 +30,6 @@
capsTests.py \
clientifTests.py \
configNetworkTests.py \
- domainMonitorTests.py \
fileVolumeTests.py \
fileUtilTests.py \
fuserTests.py \
@@ -71,6 +70,7 @@
sslhelper.py \
sslTests.py \
storageMailboxTests.py \
+ storageMonitorTests.py \
tcTests.py \
testlibTests.py \
toolTests.py \
diff --git a/tests/domainMonitorTests.py b/tests/storageMonitorTests.py
similarity index 90%
rename from tests/domainMonitorTests.py
rename to tests/storageMonitorTests.py
index b4b8d39..112d739 100644
--- a/tests/domainMonitorTests.py
+++ b/tests/storageMonitorTests.py
@@ -18,15 +18,15 @@
# Refer to the README and COPYING files for full details of the license
#
-from storage import domainMonitor
+from storage import monitor
from testlib import VdsmTestCase
class FrozenStatusTests(VdsmTestCase):
def setUp(self):
- self.status = domainMonitor.DomainMonitorStatus()
- self.frozen = domainMonitor.FrozenStatus(self.status)
+ self.status = monitor.DomainMonitorStatus()
+ self.frozen = monitor.FrozenStatus(self.status)
def test_copy_attributes(self):
for name in self.status.__slots__:
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 323b586..e6e3bfa 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -1015,7 +1015,7 @@
%{_datadir}/%{vdsm_name}/storage/curlImgWrap.py*
%{_datadir}/%{vdsm_name}/storage/devicemapper.py*
%{_datadir}/%{vdsm_name}/storage/dispatcher.py*
-%{_datadir}/%{vdsm_name}/storage/domainMonitor.py*
+%{_datadir}/%{vdsm_name}/storage/monitor.py*
%{_datadir}/%{vdsm_name}/storage/fileSD.py*
%{_datadir}/%{vdsm_name}/storage/fileUtils.py*
%{_datadir}/%{vdsm_name}/storage/fileVolume.py*
diff --git a/vdsm/storage/Makefile.am b/vdsm/storage/Makefile.am
index 99b1460..fcbbb61 100644
--- a/vdsm/storage/Makefile.am
+++ b/vdsm/storage/Makefile.am
@@ -31,7 +31,6 @@
curlImgWrap.py \
devicemapper.py \
dispatcher.py \
- domainMonitor.py \
fileSD.py \
fileUtils.py \
fileVolume.py \
@@ -47,6 +46,7 @@
localFsSD.py \
lvm.py \
misc.py \
+ monitor.py \
mount.py \
multipath.py \
nfsSD.py \
diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index 722a858..7d009c6 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -43,7 +43,7 @@
from spbackends import MAX_POOL_DESCRIPTION_SIZE, MAX_DOMAINS
from spbackends import StoragePoolDiskBackend
from spbackends import StoragePoolMemoryBackend
-import domainMonitor
+import monitor
import sd
import blockSD
import nfsSD
@@ -392,7 +392,7 @@
storageRefreshThread.start()
monitorInterval = config.getint('irs', 'sd_health_check_delay')
- self.domainMonitor = domainMonitor.DomainMonitor(monitorInterval)
+ self.domainMonitor = monitor.DomainMonitor(monitorInterval)
@property
def ready(self):
diff --git a/vdsm/storage/domainMonitor.py b/vdsm/storage/monitor.py
similarity index 100%
rename from vdsm/storage/domainMonitor.py
rename to vdsm/storage/monitor.py
--
To view, visit http://gerrit.ovirt.org/32506
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae1686411a7cfa72580cb6e97bbf54362335dab3
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsof...@redhat.com>
_______________________________________________
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
