1:34 a.m.
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: storage: move storageServer to lib/vdsm
......................................................................
storage: move storageServer to lib/vdsm
Change-Id: I0fba9e9da91354a2e28fdf0ce754836ae61c7094
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M lib/vdsm/storage/Makefile.am
R lib/vdsm/storage/storageServer.py
M tests/storage_storageserver_test.py
M vdsm.spec.in
M vdsm/storage/Makefile.am
M vdsm/storage/hsm.py
6 files changed, 10 insertions(+), 8 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/16/73116/1
diff --git a/lib/vdsm/storage/Makefile.am b/lib/vdsm/storage/Makefile.am
index 47bb7fb..096d903 100644
--- a/lib/vdsm/storage/Makefile.am
+++ b/lib/vdsm/storage/Makefile.am
@@ -52,6 +52,7 @@
resourceManager.py \
rwlock.py \
securable.py \
+ storageServer.py \
task.py \
taskManager.py \
threadPool.py \
diff --git a/vdsm/storage/storageServer.py b/lib/vdsm/storage/storageServer.py
similarity index 99%
rename from vdsm/storage/storageServer.py
rename to lib/vdsm/storage/storageServer.py
index 28c93d1..e6e80d4 100644
--- a/vdsm/storage/storageServer.py
+++ b/lib/vdsm/storage/storageServer.py
@@ -17,6 +17,7 @@
#
# Refer to the README and COPYING files for full details of the license
#
+from __future__ import absolute_import
import errno
import logging
diff --git a/tests/storage_storageserver_test.py b/tests/storage_storageserver_test.py
index ce0a8e7..40fba98 100644
--- a/tests/storage_storageserver_test.py
+++ b/tests/storage_storageserver_test.py
@@ -21,13 +21,13 @@
from monkeypatch import MonkeyPatch
from testlib import permutations, expandPermutations
from testlib import VdsmTestCase
-from storage.storageServer import GlusterFSConnection
-from storage.storageServer import IscsiConnection
-from storage.storageServer import MountConnection
-from storage import storageServer
from vdsm.gluster import cli as gluster_cli
from vdsm.gluster import exception as ge
+from vdsm.storage.storageServer import GlusterFSConnection
+from vdsm.storage.storageServer import IscsiConnection
+from vdsm.storage.storageServer import MountConnection
+from vdsm.storage import storageServer
class FakeSupervdsm(object):
diff --git a/vdsm.spec.in b/vdsm.spec.in
index b832882..7109533 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -941,7 +941,6 @@
%{_datadir}/%{vdsm_name}/storage/sd.py*
%{_datadir}/%{vdsm_name}/storage/sp.py*
%{_datadir}/%{vdsm_name}/storage/spbackends.py*
-%{_datadir}/%{vdsm_name}/storage/storageServer.py*
%{_datadir}/%{vdsm_name}/storage/volume.py*
%{_datadir}/%{vdsm_name}/storage/imageRepository/__init__.py*
%{_datadir}/%{vdsm_name}/storage/imageRepository/formatConverter.py*
@@ -1208,6 +1207,7 @@
%{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/storageServer.py*
%{python_sitelib}/%{vdsm_name}/storage/task.py*
%{python_sitelib}/%{vdsm_name}/storage/taskManager.py*
%{python_sitelib}/%{vdsm_name}/storage/threadPool.py*
diff --git a/vdsm/storage/Makefile.am b/vdsm/storage/Makefile.am
index 29a45a4..29450dc 100644
--- a/vdsm/storage/Makefile.am
+++ b/vdsm/storage/Makefile.am
@@ -42,8 +42,8 @@
sd.py \
sp.py \
spbackends.py \
- storageServer.py \
- volume.py
+ volume.py \
+ $(NULL)
dist_vdsmexec_SCRIPTS = \
curl-img-wrap \
diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index 216dfd3..ccce68e 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -58,6 +58,7 @@
from vdsm.storage import multipath
from vdsm.storage import outOfProcess as oop
from vdsm.storage import resourceManager as rm
+from vdsm.storage import storageServer
from vdsm.storage import taskManager
from vdsm.storage import types
from vdsm.storage.constants import STORAGE
@@ -78,7 +79,6 @@
from sdc import sdCache
import image
import merge
-import storageServer
import sdm.api.create_volume
--
To view, visit https://gerrit.ovirt.org/73116
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0fba9e9da91354a2e28fdf0ce754836ae61c7094
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
3:37 p.m.
New subject: Change in vdsm[master]: storage: move storageServer to lib/vdsm/storage/server.py
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: storage: move storageServer to lib/vdsm/storage/server.py
......................................................................
Patch Set 2:
ci please build
--
To view, visit https://gerrit.ovirt.org/73116
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I0fba9e9da91354a2e28fdf0ce754836ae61c7094
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
3:40 p.m.
New subject: Change in vdsm[master]: storage: move storageServer to lib/vdsm/storage/server.py
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: storage: move storageServer to lib/vdsm/storage/server.py
......................................................................
Patch Set 2:
http://jenkins.ovirt.org/job/ovirt-system-tests_manual/98/
--
To view, visit https://gerrit.ovirt.org/73116
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I0fba9e9da91354a2e28fdf0ce754836ae61c7094
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
4:18 p.m.
New subject: Change in vdsm[master]: storage: move storageServer to lib/vdsm/storage/server.py
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: storage: move storageServer to lib/vdsm/storage/server.py
......................................................................
Patch Set 2: Verified+1
passes ost
--
To view, visit https://gerrit.ovirt.org/73116
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I0fba9e9da91354a2e28fdf0ce754836ae61c7094
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
5:30 a.m.
New subject: Change in vdsm[master]: storage: move storageServer to lib/vdsm/storage/server.py
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: storage: move storageServer to lib/vdsm/storage/server.py
......................................................................
Patch Set 3:
ci please build
--
To view, visit https://gerrit.ovirt.org/73116
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I0fba9e9da91354a2e28fdf0ce754836ae61c7094
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
6:31 a.m.
New subject: Change in vdsm[master]: storage: move storageServer to lib/vdsm/storage/server.py
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: storage: move storageServer to lib/vdsm/storage/server.py
......................................................................
Patch Set 3:
http://jenkins.ovirt.org/job/ovirt-system-tests_manual/547/
--
To view, visit https://gerrit.ovirt.org/73116
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I0fba9e9da91354a2e28fdf0ce754836ae61c7094
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
6:59 a.m.
New subject: Change in vdsm[master]: storage: move storageServer to lib/vdsm/storage/server.py
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: storage: move storageServer to lib/vdsm/storage/server.py
......................................................................
Patch Set 3: Verified+1
--
To view, visit https://gerrit.ovirt.org/73116
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I0fba9e9da91354a2e28fdf0ce754836ae61c7094
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
3:16 p.m.
New subject: Change in vdsm[master]: storage: move storageServer to lib/vdsm/storage/server.py
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has abandoned this change.
Change subject: storage: move storageServer to lib/vdsm/storage/server.py
......................................................................
Abandoned
all of storage is moved by Piotr
--
To view, visit https://gerrit.ovirt.org/73116
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: abandon
Gerrit-Change-Id: I0fba9e9da91354a2e28fdf0ce754836ae61c7094
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
2494
days inactive
2608
days old
vdsm-patches@lists.fedorahosted.org
7 comments
1 participants
participants (1)
-
Code Review