Change in vdsm[master]: storage: move iscsi.py to vdsm storage lib
From Dan Kenigsberg : Dan Kenigsberg has posted comments on this change. Change subject: storage: move iscsi.py to vdsm storage lib .. Patch Set 6: Verified+1 passes QE tier1 -- To view, visit https://gerrit.ovirt.org/56896 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I939e3bb2da660eeff7a11da1c996c77d9aaf923c Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Idan Shaby Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Freddy Rolland Gerrit-Reviewer: Idan Shaby Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenkins CI RO Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Tal Nisan Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: storage: move iscsi.py to vdsm storage lib
From Dan Kenigsberg : Dan Kenigsberg has restored this change. Change subject: storage: move iscsi.py to vdsm storage lib .. Restored still wanted -- To view, visit https://gerrit.ovirt.org/56896 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: restore Gerrit-Change-Id: I939e3bb2da660eeff7a11da1c996c77d9aaf923c Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Idan Shaby Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Freddy Rolland Gerrit-Reviewer: Idan Shaby Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenkins CI RO Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Tal Nisan Gerrit-Reviewer: gerrit-hooks ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: storage: move iscsi.py to vdsm storage lib
gerrit-hooks has posted comments on this change. Change subject: storage: move iscsi.py to vdsm storage lib .. Patch Set 4: * Update tracker: IGNORE, no Bug-Url found -- To view, visit https://gerrit.ovirt.org/56896 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I939e3bb2da660eeff7a11da1c996c77d9aaf923c Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Idan Shaby Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Freddy Rolland Gerrit-Reviewer: Idan Shaby Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Tal Nisan Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: storage: move iscsi.py to vdsm storage lib
Idan Shaby has abandoned this change. Change subject: storage: move iscsi.py to vdsm storage lib .. Abandoned Abandoning this patch due to inability to merge it in a reasonable time. -- To view, visit https://gerrit.ovirt.org/56896 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I939e3bb2da660eeff7a11da1c996c77d9aaf923c Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Idan Shaby Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Freddy Rolland Gerrit-Reviewer: Idan Shaby Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Tal Nisan Gerrit-Reviewer: gerrit-hooks ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: storage: move iscsi.py to vdsm storage lib
Nir Soffer has posted comments on this change. Change subject: storage: move iscsi.py to vdsm storage lib .. Patch Set 4: Code-Review-1 Don't merge yet. -- To view, visit https://gerrit.ovirt.org/56896 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I939e3bb2da660eeff7a11da1c996c77d9aaf923c Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Idan Shaby Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Freddy Rolland Gerrit-Reviewer: Idan Shaby Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Tal Nisan Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: storage: move iscsi.py to vdsm storage lib
Idan Shaby has posted comments on this change. Change subject: storage: move iscsi.py to vdsm storage lib .. Patch Set 4: Verified+1 -- To view, visit https://gerrit.ovirt.org/56896 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I939e3bb2da660eeff7a11da1c996c77d9aaf923c Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Idan Shaby Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Freddy Rolland Gerrit-Reviewer: Idan Shaby Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Tal Nisan Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: storage: move iscsi.py to vdsm storage lib
gerrit-hooks has posted comments on this change. Change subject: storage: move iscsi.py to vdsm storage lib .. Patch Set 4: * Update tracker: IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6']) -- To view, visit https://gerrit.ovirt.org/56896 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I939e3bb2da660eeff7a11da1c996c77d9aaf923c Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Idan Shaby Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Freddy Rolland Gerrit-Reviewer: Idan Shaby Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Tal Nisan Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: storage: move iscsi.py to vdsm storage lib
Freddy Rolland has posted comments on this change. Change subject: storage: move iscsi.py to vdsm storage lib .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/56896 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I939e3bb2da660eeff7a11da1c996c77d9aaf923c Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Idan Shaby Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Freddy Rolland Gerrit-Reviewer: Idan Shaby Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Tal Nisan Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: storage: move iscsi.py to vdsm storage lib
gerrit-hooks has posted comments on this change. Change subject: storage: move iscsi.py to vdsm storage lib .. Patch Set 3: * Update tracker: IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6']) -- To view, visit https://gerrit.ovirt.org/56896 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I939e3bb2da660eeff7a11da1c996c77d9aaf923c Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Idan Shaby Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Freddy Rolland Gerrit-Reviewer: Idan Shaby Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Tal Nisan Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: storage: move iscsi.py to vdsm storage lib
Ala Hino has posted comments on this change. Change subject: storage: move iscsi.py to vdsm storage lib .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/56896 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I939e3bb2da660eeff7a11da1c996c77d9aaf923c Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Idan Shaby Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Freddy Rolland Gerrit-Reviewer: Idan Shaby Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Tal Nisan Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: storage: move iscsi.py to vdsm storage lib
Freddy Rolland has posted comments on this change. Change subject: storage: move iscsi.py to vdsm storage lib .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/56896 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I939e3bb2da660eeff7a11da1c996c77d9aaf923c Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Idan Shaby Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Freddy Rolland Gerrit-Reviewer: Idan Shaby Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Tal Nisan Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: storage: move iscsi.py to vdsm storage lib
Idan Shaby has posted comments on this change. Change subject: storage: move iscsi.py to vdsm storage lib .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.ovirt.org/56896 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I939e3bb2da660eeff7a11da1c996c77d9aaf923c Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Idan Shaby Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Freddy Rolland Gerrit-Reviewer: Idan Shaby Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Tal Nisan Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: storage: move iscsi.py to vdsm storage lib
gerrit-hooks has posted comments on this change. Change subject: storage: move iscsi.py to vdsm storage lib .. Patch Set 2: * Update tracker: IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6']) -- To view, visit https://gerrit.ovirt.org/56896 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I939e3bb2da660eeff7a11da1c996c77d9aaf923c Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Idan Shaby Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Freddy Rolland Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Tal Nisan Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: storage: move iscsi.py to vdsm storage lib
Idan Shaby has uploaded a new change for review.
Change subject: storage: move iscsi.py to vdsm storage lib
..
storage: move iscsi.py to vdsm storage lib
This patch moves the module vdsm/storage/iscsi.py to
lib/vdsm/storage/iscsi.py.
Change-Id: I939e3bb2da660eeff7a11da1c996c77d9aaf923c
Signed-off-by: Idan Shaby
---
M lib/vdsm/storage/Makefile.am
R lib/vdsm/storage/iscsi.py
M tests/iscsiTests.py
M vdsm.spec.in
M vdsm/storage/Makefile.am
M vdsm/storage/blockSD.py
M vdsm/storage/hsm.py
M vdsm/storage/multipath.py
M vdsm/storage/storageServer.py
M vdsm/supervdsmServer
10 files changed, 12 insertions(+), 12 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/96/56896/1
diff --git a/lib/vdsm/storage/Makefile.am b/lib/vdsm/storage/Makefile.am
index 67c0d62..7f222fa 100644
--- a/lib/vdsm/storage/Makefile.am
+++ b/lib/vdsm/storage/Makefile.am
@@ -33,6 +33,7 @@
hba.py \
imageSharing.py \
imagetickets.py \
+ iscsi.py \
iscsiadm.py \
misc.py \
mount.py \
diff --git a/vdsm/storage/iscsi.py b/lib/vdsm/storage/iscsi.py
similarity index 99%
rename from vdsm/storage/iscsi.py
rename to lib/vdsm/storage/iscsi.py
index 9e3c8c3..e4be2d5 100644
--- a/vdsm/storage/iscsi.py
+++ b/lib/vdsm/storage/iscsi.py
@@ -1,5 +1,5 @@
#
-# Copyright 2009-2012 Red Hat, Inc.
+# Copyright 2009-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
@@ -23,6 +23,8 @@
facility
"""
+from __future__ import absolute_import
+
import errno
import glob
import logging
diff --git a/tests/iscsiTests.py b/tests/iscsiTests.py
index 73aac95..2413e53 100644
--- a/tests/iscsiTests.py
+++ b/tests/iscsiTests.py
@@ -8,9 +8,8 @@
from vdsm import commands
from vdsm import utils
from vdsm.password import ProtectedPassword
+from vdsm.storage import iscsi
from vdsm.storage import iscsiadm
-
-from storage import iscsi
def fake_rescan(timeout):
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 0d1c991..139aa77 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -943,7 +943,6 @@
%{_datadir}/%{vdsm_name}/storage/glusterVolume.py*
%{_datadir}/%{vdsm_name}/storage/hsm.py*
%{_datadir}/%{vdsm_name}/storage/image.py*
-%{_datadir}/%{vdsm_name}/storage/iscsi.py*
%{_datadir}/%{vdsm_name}/storage/localFsSD.py*
%{_datadir}/%{vdsm_name}/storage/lvm.env
%{_datadir}/%{vdsm_name}/storage/lvm.py*
@@ -1186,6 +1185,7 @@
%{python_sitelib}/%{vdsm_name}/storage/hba.py*
%{python_sitelib}/%{vdsm_name}/storage/imageSharing.py*
%{python_sitelib}/%{vdsm_name}/storage/imagetickets.py*
+%{python_sitelib}/%{vdsm_name}/storage/iscsi.py*
%{python_sitelib}/%{vdsm_name}/storage/iscsiadm.py*
%{python_sitelib}/%{vdsm_name}/storage/misc.py*
%{python_sitelib}/%{vdsm_name}/storage/mount.py*
diff --git a/vdsm/storage/Makefile.am b/vdsm/storage/Makefile.am
index babbc03..230999c 100644
--- a/vdsm/storage/Makefile.am
+++ b/vdsm/storage/Makefile.am
@@ -34,7 +34,6 @@
glusterVolume.py \
hsm.py \
image.py \
- iscsi.py \
localFsSD.py \
lvm.py \
monitor.py \
diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py
index 15b0f84..6404034 100644
--- a/vdsm/storage/blockSD.py
+++ b/vdsm/storage/blockSD.py
@@ -40,6 +40,7 @@
from vdsm.storage import constants as storage_constants
from vdsm.storage import exception as se
from vdsm.storage import fileUtils
+from vdsm.storage import iscsi
from vdsm.storage import misc
from vdsm.storage import mount
from vdsm.storage.persistent import PersistentDict, DictValidator
@@ -51,7 +52,6 @@
import multipath
import resourceFactories
from resourceFactories import LVM_ACTIVATION_NAMESPACE
-import iscsi
from storage_mailbox import MAILBOX_SIZE
import resourceManager as rm
import volume
diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index 0d87cf7..091d0a4 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -49,6 +49,7 @@
from vdsm.storage import exception as se
from vdsm.storage import fileUtils
from vdsm.storage import imagetickets
+from vdsm.storage import iscsi
from vdsm.storage import misc
from vdsm.storage import mount
from vdsm.storage.constants import STORAGE
@@ -71,7 +72,6 @@
from sdc import sdCache
import image
import volume
-import iscsi
import taskManager
from threadLocal import vars
import resourceManager as rm
diff --git a/vdsm/storage/multipath.py b/vdsm/storage/multipath.py
index 77c54a7..62822ae 100644
--- a/vdsm/storage/multipath.py
+++ b/vdsm/storage/multipath.py
@@ -37,9 +37,8 @@
from vdsm.config import config
from vdsm.storage import devicemapper
from vdsm.storage import hba
+from vdsm.storage import iscsi
from vdsm.storage import misc
-
-import iscsi
DEV_ISCSI = "iSCSI"
DEV_FCP = "FCP"
diff --git a/vdsm/storage/storageServer.py b/vdsm/storage/storageServer.py
index 922ef9c..ec649ea 10064
Change in vdsm[master]: storage: move iscsi.py to vdsm storage lib
gerrit-hooks has posted comments on this change. Change subject: storage: move iscsi.py to vdsm storage lib .. Patch Set 1: * Update tracker: IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6']) -- To view, visit https://gerrit.ovirt.org/56896 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I939e3bb2da660eeff7a11da1c996c77d9aaf923c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Idan Shaby Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
